Merge branch 'master' of git://repo.or.cz/git-gui

[git.git] / git-gui / lib / merge.tcl

diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 3dce856e5ef29663f10fec818a2b25a9737060c0..ae0389df5bfb13b2823720c241b861b7b36b9e95 100644 (file)
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
@@ -123,8 +123,10 @@ Please select fewer branches.  To merge more than 15 branches, merge the branche
        set msg "Merging $current_branch, [join $names {, }]"
        set ui_status_value "$msg..."
        set cons [console::new "Merge" $msg]
-       console::exec $cons $cmd [namespace code [list _finish $revcnt]]
-       bind $w <Destroy> {}
+       console::exec $cons $cmd \
+               [namespace code [list _finish $revcnt $cons]]
+
+       wm protocol $w WM_DELETE_WINDOW {}
        destroy $w
 }
 
@@ -238,6 +240,8 @@ proc dialog {} {
                        $subj([lindex $ref 0])]
        }
 
+       bind $w.source.l <Key-K> [list event generate %W <Shift-Key-Up>]
+       bind $w.source.l <Key-J> [list event generate %W <Shift-Key-Down>]
        bind $w.source.l <Key-k> [list event generate %W <Key-Up>]
        bind $w.source.l <Key-j> [list event generate %W <Key-Down>]
        bind $w.source.l <Key-h> [list event generate %W <Key-Left>]
@@ -247,7 +251,7 @@ proc dialog {} {
        bind $w <$M1B-Key-Return> $_start
        bind $w <Visibility> "grab $w; focus $w.source.l"
        bind $w <Key-Escape> "unlock_index;destroy $w"
-       bind $w <Destroy> unlock_index
+       wm protocol $w WM_DELETE_WINDOW "unlock_index;destroy $w"
        wm title $w "[appname] ([reponame]): Merge"
        tkwait window $w
 }