From: Takashi Iwai <tiwai@suse.de>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Paul Mackerras <paulus@samba.org>,
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Subject: [PATCH 1/4] gitk: Fix crash with --all in non-English locales
Date: Tue, 20 Oct 2015 14:33:01 +0200 [thread overview]
Message-ID: <1445344384-12762-2-git-send-email-tiwai@suse.de> (raw)
In-Reply-To: <1445344384-12762-1-git-send-email-tiwai@suse.de>
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
next prev parent reply other threads:[~2015-10-20 12:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-20 12:33 [PATCH 0/4] gitk crash fix and locale updates Takashi Iwai
2015-10-20 12:33 ` Takashi Iwai [this message]
2015-10-20 12:33 ` [PATCH 2/4] gitk: Update msgid's for menu items with accelerator Takashi Iwai
2015-10-20 12:33 ` [PATCH 3/4] gitk: Add accelerators to Japanese locale Takashi Iwai
2015-10-20 12:33 ` [PATCH 4/4] gitk: Add accelerator to German locale Takashi Iwai
2015-10-30 10:04 ` [PATCH 0/4] gitk crash fix and locale updates Paul Mackerras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445344384-12762-2-git-send-email-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=giuseppe.bilotta@gmail.com \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).