git-gui: Force focus to the diff viewer on mouse click.

diff --git a/git-gui.sh b/git-gui.sh
index ee7fdaabfd56d6991b4503a44097e36162239846..ea4136c98b0621264969f47a11f80d24834bf77f 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -428,6 +428,7 @@ proc load_message {file} {
                }
                set content [string trim [read $fd]]
                close $fd
+               regsub -all -line {[ \r\t]+$} $content {} content
                $ui_comm delete 0.0 end
                $ui_comm insert end $content
                return 1
@@ -1046,6 +1047,7 @@ You must add at least 1 file before you can commit.
        # -- A message is required.
        #
        set msg [string trim [$ui_comm get 1.0 end]]
+       regsub -all -line {[ \t\r]+$} $msg {} msg
        if {$msg eq {}} {
                error_popup {Please supply a commit message.
 
@@ -2984,12 +2986,13 @@ proc do_quit {} {
        #
        set save [gitdir GITGUI_MSG]
        set msg [string trim [$ui_comm get 0.0 end]]
-       if {![string match amend* $commit_type]
-               && [$ui_comm edit modified]
+       regsub -all -line {[ \r\t]+$} $msg {} msg
+       if {(![string match amend* $commit_type]
+               || [$ui_comm edit modified])
                && $msg ne {}} {
                catch {
                        set fd [open $save w]
-                       puts $fd [string trim [$ui_comm get 0.0 end]]
+                       puts -nonewline $fd $msg
                        close $fd
                }
        } else {
@@ -4416,6 +4419,7 @@ bind_button3 $ui_diff "
        }
        tk_popup $ctxm %X %Y
 "
+unset ui_diff_applyhunk
 
 # -- Status Bar
 #
@@ -4468,6 +4472,7 @@ bind $ui_diff <Key-Up>     {catch {%W yview scroll -1 units};break}
 bind $ui_diff <Key-Down>   {catch {%W yview scroll  1 units};break}
 bind $ui_diff <Key-Left>   {catch {%W xview scroll -1 units};break}
 bind $ui_diff <Key-Right>  {catch {%W xview scroll  1 units};break}
+bind $ui_diff <Button-1>   {focus %W}
 
 if {!$single_commit} {
        bind . <$M1B-Key-n> do_create_branch