From: Kacper Kornet <draenog@pld-linux.org>
Date: Mon, 7 Feb 2011 16:37:53 +0000 (+0000)
Subject: - fix for key bindings in SHA1 bar
X-Git-Tag: auto/th/git-core-1_7_4_1-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgit-core.git;a=commitdiff_plain;h=b2c254f3e28a2c4f61633611e2fcf773630dfe39

- fix for key bindings in SHA1 bar

Changed files:
    git-core-key-bindings.patch -> 1.1
    git-core.spec -> 1.233
---

diff --git a/git-core-key-bindings.patch b/git-core-key-bindings.patch
new file mode 100644
index 0000000..0f3c17f
--- /dev/null
+++ b/git-core-key-bindings.patch
@@ -0,0 +1,45 @@
+From 2ad6d3e9325a39333be0c4b9094e9d5e756dea65 Mon Sep 17 00:00:00 2001
+From: Kacper <kornet@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
+
diff --git a/git-core.spec b/git-core.spec
index 8e111e9..5357dee 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -21,6 +21,7 @@ Source4:	%{name}.sysconfig
 Source5:	%{name}.inet
 Source6:	%{name}.init
 Patch0:		%{name}-tests.patch
+Patch1:		%{name}-key-bindings.patch
 URL:		http://git-scm.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -368,6 +369,7 @@ Ta wtyczka dostarcza podświetlanie składni dla treści commitów gita.
 %prep
 %setup -q -n git-%{version}
 %patch0 -p1
+%patch1 -p0
 
 %build
 %{__aclocal}