From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 24 May 2007 06:33:13 +0000 (-0400)
Subject: Correct key bindings to Control-<foo>
X-Git-Tag: gitgui-0.7.2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d5793bf52223ccec40aff2839a3c5bad96bca8b;p=git.git

Correct key bindings to Control-<foo>

Alberto Bertogli reported on #git that git-gui was exiting with
alt-q, while gitk on the same system was exiting with ctrl-q.
That was not what I wanted.  I really wanted M1B to be bound to
the Control key on most non-Mac OS X platforms, but according to
Sam Vilain M1 on most systems means alt.  Since gitk always does
control, I'm doing the same thing for all non-Mac OS X systems.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index 40f54e4da..cfc4c7f68 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1206,15 +1206,12 @@ foreach class {Button Checkbutton Entry Label
 }
 unset class
 
-if {[is_Windows]} {
-	set M1B Control
-	set M1T Ctrl
-} elseif {[is_MacOSX]} {
+if {[is_MacOSX]} {
 	set M1B M1
 	set M1T Cmd
 } else {
-	set M1B M1
-	set M1T M1
+	set M1B Control
+	set M1T Ctrl
 }
 
 proc apply_config {} {