git-gui: Stop deleting gitk preferences.

[git.git] / git-gui.sh

diff --git a/git-gui.sh b/git-gui.sh
index d3cf57af5a67970cca05b122c4d8b9bf5d2cb7a4..ea16be43ac900d3946ddf01107ed46493029169b 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -3339,7 +3339,7 @@ proc show_blame {commit path} {
                                $w.out.linenumber_t \\
                                $w.out.file_t \\
                                $i @%x,%y
-                       break
+                       focus $i
                "
                bind_button3 $i "
                        set cursorX %x
@@ -3349,6 +3349,7 @@ proc show_blame {commit path} {
                "
        }
 
+       bind $w.cm.t <Button-1> "focus $w.cm.t"
        bind $tl <Visibility> "focus $tl"
        bind $tl <Destroy> "
                array unset blame_status {$w}
@@ -3428,6 +3429,7 @@ proc read_blame_incremental {fd w w_load w_cmit w_line w_file} {
                                $w_file tag conf g$cmit
                                $w_line tag raise in_sel
                                $w_file tag raise in_sel
+                               $w_file tag raise sel
                                set blame_data($w,$cmit,order) $blame_data($w,commit_count)
                                incr blame_data($w,commit_count)
                                lappend blame_data($w,commit_list) $cmit
@@ -4013,14 +4015,6 @@ set starting_gitk_msg {Starting gitk... please wait...}
 proc do_gitk {revs} {
        global env ui_status_value starting_gitk_msg
 
-       # -- On Windows gitk is severly broken, and right now it seems like
-       #    nobody cares about fixing it.  The only known workaround is to
-       #    always delete ~/.gitk before starting the program.
-       #
-       if {[is_Windows]} {
-               catch {file delete [file join $env(HOME) .gitk]}
-       }
-
        # -- Always start gitk through whatever we were loaded with.  This
        #    lets us bypass using shell process on Windows systems.
        #