summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-12 07:14:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-12 07:14:47 (GMT)
commit1924d64f6e070edf1ad1949bf2eb95d4d2451f30 (patch)
treeaf77317e800b35c312ef562ffb72fa7c045af738 /git-gui/lib/merge.tcl
parent75d8ff138dd640a117c6aaa625d0f6b835adbd3a (diff)
parent03e1bed4a4887607ae90cd121cb4851d10ef2e8b (diff)
downloadgit-1924d64f6e070edf1ad1949bf2eb95d4d2451f30.zip
git-1924d64f6e070edf1ad1949bf2eb95d4d2451f30.tar.gz
git-1924d64f6e070edf1ad1949bf2eb95d4d2451f30.tar.bz2
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: git-gui: Save geometry before the window layout is damaged git-gui: Give amend precedence to HEAD over MERGE_MSG git-gui: Include 'war on whitespace' fixes from git.git
Diffstat (limited to 'git-gui/lib/merge.tcl')
-rw-r--r--git-gui/lib/merge.tcl5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 24ed24b..ae0389d 100644
--- 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
}
@@ -250,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
}