diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-06-11 23:58:11 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-06-11 23:58:11 -0400 |
| commit | 03e1bed4a4887607ae90cd121cb4851d10ef2e8b (patch) | |
| tree | 166e015cd8b842fd28ddb138faa2ff7213528294 /lib/merge.tcl | |
| parent | aa751960178af04673f88adca4988f94ffd7f2dc (diff) | |
| parent | 39fa2a983d55b37759b99e67f9f1892879efb775 (diff) | |
| download | git-03e1bed4a4887607ae90cd121cb4851d10ef2e8b.tar.gz git-03e1bed4a4887607ae90cd121cb4851d10ef2e8b.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Save geometry before the window layout is damaged
git-gui: Give amend precedence to HEAD over MERGE_MSG
Diffstat (limited to 'lib/merge.tcl')
| -rw-r--r-- | lib/merge.tcl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index 24ed24b3d..ae0389df5 100644 --- a/lib/merge.tcl +++ b/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 } |