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

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

diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 24ed24b3d091230d186208bd3656867f3fea70a0..889182f5454ac0f636fc57c31a16331c097b0c71 100644 (file)
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
@@ -125,7 +125,8 @@ Please select fewer branches.  To merge more than 15 branches, merge the branche
        set cons [console::new "Merge" $msg]
        console::exec $cons $cmd \
                [namespace code [list _finish $revcnt $cons]]
-       bind $w <Destroy> {}
+
+       wm protocol $w WM_DELETE_WINDOW {}
        destroy $w
 }
 
@@ -212,7 +213,9 @@ proc dialog {} {
        pack $w.buttons.visualize -side left
        button $w.buttons.create -text Merge -command $_start
        pack $w.buttons.create -side right
-       button $w.buttons.cancel -text {Cancel} -command [list destroy $w]
+       button $w.buttons.cancel \
+               -text {Cancel} \
+               -command "unlock_index;destroy $w"
        pack $w.buttons.cancel -side right -padx 5
        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 
@@ -250,7 +253,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
 }