46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
|
From dc5621adb09150be368d2a3d29f4312f79dfcbd3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Takashi Iwai <tiwai@suse.de>
|
||
|
|
Date: Tue, 20 Oct 2015 13:40:13 +0200
|
||
|
|
Subject: [PATCH 1/4] gitk: Fix crash with --all in non-English locales
|
||
|
|
|
||
|
|
When gitk is invoked with --all option in a non-English locale, it
|
||
|
|
crashes like:
|
||
|
|
$ LC_ALL="de_DE.UTF-8" gitk --all
|
||
|
|
Error in startup script: bad menu entry index "Ansicht bearbeiten ..."
|
||
|
|
while executing
|
||
|
|
".bar.view entryconf [mca "Edit view..."] -state normal"
|
||
|
|
invoked from within
|
||
|
|
"if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
|
||
|
|
# create a view for the files/dirs specified on the command line
|
||
|
|
se..."
|
||
|
|
(file "/usr/bin/gitk" line 12442)
|
||
|
|
|
||
|
|
The reason is the leftover strings that don't match any longer with
|
||
|
|
the new string containing accelerator mark (&). This patch corrects
|
||
|
|
these strings.
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=951153
|
||
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||
|
|
---
|
||
|
|
gitk-git/gitk | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/gitk-git/gitk b/gitk-git/gitk
|
||
|
|
index 2028b554f487..fcc606eab735 100755
|
||
|
|
--- a/gitk-git/gitk
|
||
|
|
+++ b/gitk-git/gitk
|
||
|
|
@@ -12452,8 +12452,8 @@ if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
|
||
|
|
set viewchanged(1) 0
|
||
|
|
set vdatemode(1) 0
|
||
|
|
addviewmenu 1
|
||
|
|
- .bar.view entryconf [mca "Edit view..."] -state normal
|
||
|
|
- .bar.view entryconf [mca "Delete view"] -state normal
|
||
|
|
+ .bar.view entryconf [mca "&Edit view..."] -state normal
|
||
|
|
+ .bar.view entryconf [mca "&Delete view"] -state normal
|
||
|
|
}
|
||
|
|
|
||
|
|
if {[info exists permviews]} {
|
||
|
|
--
|
||
|
|
2.6.1
|
||
|
|
|