packages: git-core/git-core.spec, git-core/git-core-key-bindings.patch (NEW...

[draenog]

Author: draenog                      Date: Mon Feb  7 16:37:59 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for key bindings in SHA1 bar

---- Files affected:
packages/git-core:
   git-core.spec (1.232 -> 1.233) , git-core-key-bindings.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/git-core/git-core.spec
diff -u packages/git-core/git-core.spec:1.232 packages/git-core/git-core.spec:1.233
--- packages/git-core/git-core.spec:1.232	Tue Feb  1 19:24:38 2011
+++ packages/git-core/git-core.spec	Mon Feb  7 17:37:53 2011
@@ -22,6 +22,7 @@
 Source5:	%{name}.inet
 Source6:	%{name}.init
 Patch0:		%{name}-tests.patch
+Patch1:		%{name}-key-bindings.patch
 URL:		http://git-scm.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -369,6 +370,7 @@
 %prep
 %setup -q -n git-%{version}
 %patch0 -p1
+%patch1 -p0
 
 %build
 %{__aclocal}
@@ -689,6 +691,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.233  2011/02/07 16:37:53  draenog
+- fix for key bindings in SHA1 bar
+
 Revision 1.232  2011/02/01 18:24:38  glen
 - fix double packaging of gitweb.cgi, however current packaging doesn't work without config changes
 

================================================================
Index: packages/git-core/git-core-key-bindings.patch
diff -u /dev/null packages/git-core/git-core-key-bindings.patch:1.1
--- /dev/null	Mon Feb  7 17:37:59 2011
+++ packages/git-core/git-core-key-bindings.patch	Mon Feb  7 17:37:53 2011
@@ -0,0 +1,45 @@
+From 2ad6d3e9325a39333be0c4b9094e9d5e756dea65 Mon Sep 17 00:00:00 2001
+From: Kacper <kornet at tuptus>
+Date: Thu, 9 Dec 2010 18:57:06 +0000
+Subject: [PATCH] Preserve Entry class key bindings for SHA id
+
+If bind is specified for key without any modifier, then any combination
+of modifiers may be present in the event. So bind $e $ev "$escript;
+break" breaks some useful bindings from Entry class (for example
+Ctrl+k).
+---
+ gitk |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git gitk-git/gitk gitk-git/gitk
+index 45e3380..0c6f3af 100755
+--- gitk-git/gitk
++++ gitk-git/gitk
+@@ -2365,6 +2365,10 @@ proc makewindow {} {
+         }
+     }
+ 
++    foreach e $entries {
++        bindtags $e [linsert [bindtags $e] 2 entrybind]
++    }
++
+     bind .pwbottom <Configure> {resizecdetpanes %W %w}
+     pack .ctop -fill both -expand 1
+     bindall <1> {selcanvline %W %x %y}
+@@ -2563,12 +2567,8 @@ proc scrollcanv {cscroll f0 f1} {
+ proc bindkey {ev script} {
+     global entries
+     bind . $ev $script
+-    set escript [bind Entry $ev]
+-    if {$escript == {}} {
+-	set escript [bind Entry <Key>]
+-    }
+     foreach e $entries {
+-	bind $e $ev "$escript; break"
++	bind entrybind $ev "break"
+     }
+ }
+ 
+-- 
+1.7.3.3
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/git-core/git-core.spec?r1=1.232&r2=1.233&f=u