From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Nieder Subject: Re: gitk: 'j' and 'k' keyboard shortcuts backward Date: Mon, 19 Sep 2011 11:49:50 -0500 Message-ID: <20110919164950.GB2861@elie> References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Josh Triplett , Pat Thoyts , Robert Suetterlin , Paul Mackerras , git@vger.kernel.org To: Clemens Buchacher X-From: git-owner@vger.kernel.org Mon Sep 19 18:50:08 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1R5h2m-0008Kp-5k for gcvg-git-2@lo.gmane.org; Mon, 19 Sep 2011 18:50:08 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756804Ab1ISQuA convert rfc822-to-quoted-printable (ORCPT ); Mon, 19 Sep 2011 12:50:00 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:53567 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755013Ab1ISQt4 convert rfc822-to-8bit (ORCPT ); Mon, 19 Sep 2011 12:49:56 -0400 Received: by yxl31 with SMTP id 31so282486yxl.19 for ; Mon, 19 Sep 2011 09:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=smj//177DGMWHECIUyB7SHH+3O9HrCHHlcnyNrFZW04=; b=BtJdW6axyLizj/F52yiRyTzsM+vQ8g1eCtwjPvS1sGGmTJxZfYsSm3gpOl6EDbptYq 7UmZPOB1eZ/bt7dQFz4/qvgWBrQXO/oxyHAAfS2Zhx5ZnIaurar18nKMEx26Icug0w5s p/QRl230pQbnkngPpMIoilYwSVrVQUWizi6C8= Received: by 10.236.180.105 with SMTP id i69mr15335599yhm.64.1316450995670; Mon, 19 Sep 2011 09:49:55 -0700 (PDT) Received: from elie (99-120-124-35.lightspeed.cicril.sbcglobal.net. [99.120.124.35]) by mx.google.com with ESMTPS id e61sm17977164yhm.2.2011.09.19.09.49.53 (version=SSLv3 cipher=OTHER); Mon, 19 Sep 2011 09:49:54 -0700 (PDT) Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21+46 (b01d63af6fea) (2011-07-01) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: (+cc: Josh and upstream) Hi, Clemens Buchacher wrote: > The key bindings are not related to vi. See Help -> Key > bindings in gitk: > > k Move down one commit > j Go back in history list > > I know this has confused me too. But I don't think it's worth changin= g, > unless you can think of a solution that would confuse neither vi nor = non-vi > users. Eh, I think it's worth changing and that the non-vi users are probably just using arrow keys. :) The commit that introduced those key bindings says: | commit 6e2dda35 | Author: Robert Suetterlin | Date: Thu Sep 22 10:07:36 2005 +1000 | | [PATCH] Add new keybindings | | This adds several new keybindings to allow history and selectline | navigation. I basically added Opera-like history traversal, as w= ell | as left-right-cursor history traversal and vi-like motion command= s. | | Signed-off-by: Robert Suetterlin | Signed-off-by: Paul Mackerras How about this patch? -- >8 -- Subject: gitk: Make vi-style keybindings more vi-like When commit 6e2dda35 (Add new keybindings, 2005-09-22) added vi-style keybindings to gitk (an excellent idea!), instead of adopting the usual "hjkl =3D left, down, up, right" bindings used by less, vi, rogue= , and many other programs, it used "ijkl =3D up, left, down, right" to mimic the inverted-T formation of the arrow keys on a qwerty keyboard, in the style of Lode runner. So using 'j' and 'k' to scroll through commits produces utterly confusing results to the vi user, as 'k' moves down and 'j' moves to the previous commit. Luckily most non-vi-users are probably using an alternate set of keys (cursor keys or z/x + n/p) anyway. Switch to the expected vi/nethack convention. Requested-by: Josh Triplett Signed-off-by: Jonathan Nieder --- gitk | 12 ++++++------ po/de.po | 12 ++++++------ po/es.po | 12 ++++++------ po/fr.po | 12 ++++++------ po/hu.po | 12 ++++++------ po/it.po | 12 ++++++------ po/ja.po | 12 ++++++------ po/ru.po | 12 ++++++------ po/sv.po | 12 ++++++------ 9 files changed, 54 insertions(+), 54 deletions(-) diff --git a/gitk b/gitk index 1b0e09a5..ac3fb7d4 100755 --- a/gitk +++ b/gitk @@ -2411,9 +2411,9 @@ proc makewindow {} { bindkey n "selnextline 1" bindkey z "goback" bindkey x "goforw" - bindkey i "selnextline -1" - bindkey k "selnextline 1" - bindkey j "goback" + bindkey k "selnextline -1" + bindkey j "selnextline 1" + bindkey h "goback" bindkey l "goforw" bindkey b prevfile bindkey d "$ctext yview scroll 18 units" @@ -2822,9 +2822,9 @@ proc keys {} { [mc "<%s-W> Close window" $M1T] [mc " Move to first commit"] [mc " Move to last commit"] -[mc ", p, i Move up one commit"] -[mc ", n, k Move down one commit"] -[mc ", z, j Go back in history list"] +[mc ", p, k Move up one commit"] +[mc ", n, j Move down one commit"] +[mc ", z, h Go back in history list"] [mc ", x, l Go forward in history list"] [mc " Move up one page in commit list"] [mc " Move down one page in commit list"] diff --git a/po/de.po b/po/de.po index bd194a3d..e4cf661a 100644 --- a/po/de.po +++ b/po/de.po @@ -371,16 +371,16 @@ msgid "\t\tMove to last commit" msgstr "\t\tZur =C3=A4ltesten Version springen" =20 #: gitk:2819 -msgid ", p, i\tMove up one commit" -msgstr ", p, i\tN=C3=A4chste neuere Version" +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tN=C3=A4chste neuere Version" =20 #: gitk:2820 -msgid ", n, k\tMove down one commit" -msgstr ", n, k\tN=C3=A4chste =C3=A4ltere Version" +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tN=C3=A4chste =C3=A4ltere Version" =20 #: gitk:2821 -msgid ", z, j\tGo back in history list" -msgstr ", z, j\tEine Version zur=C3=BCckgehen" +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tEine Version zur=C3=BCckgehen" =20 #: gitk:2822 msgid ", x, l\tGo forward in history list" diff --git a/po/es.po b/po/es.po index 0471dd06..9c8bcd29 100644 --- a/po/es.po +++ b/po/es.po @@ -319,16 +319,16 @@ msgid "\t\tMove to last commit" msgstr "\t\tIr a la =C3=BAltima revisi=C3=B3n" =20 #: gitk:2522 -msgid ", p, i\tMove up one commit" -msgstr ", p, i\tSubir una revisi=C3=B3n" +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tSubir una revisi=C3=B3n" =20 #: gitk:2523 -msgid ", n, k\tMove down one commit" -msgstr ", n, k\tBajar una revisi=C3=B3n" +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tBajar una revisi=C3=B3n" =20 #: gitk:2524 -msgid ", z, j\tGo back in history list" -msgstr ", z, j\tRetroceder en la historia" +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tRetroceder en la historia" =20 #: gitk:2525 msgid ", x, l\tGo forward in history list" diff --git a/po/fr.po b/po/fr.po index 5370ddc3..ff476191 100644 --- a/po/fr.po +++ b/po/fr.po @@ -372,16 +372,16 @@ msgid "\t\tMove to last commit" msgstr "\t\tAller au dernier commit" =20 #: gitk:2691 -msgid ", p, i\tMove up one commit" -msgstr ", p, i\t Aller au commit suivant" +msgid ", p, k\tMove up one commit" +msgstr ", p, k\t Aller au commit suivant" =20 #: gitk:2692 -msgid ", n, k\tMove down one commit" -msgstr ", n, k\t Aller au commit pr=C3=A9c=C3=A9dent" +msgid ", n, j\tMove down one commit" +msgstr ", n, j\t Aller au commit pr=C3=A9c=C3=A9dent" =20 #: gitk:2693 -msgid ", z, j\tGo back in history list" -msgstr ", z, j\tReculer dans l'historique" +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tReculer dans l'historique" =20 #: gitk:2694 msgid ", x, l\tGo forward in history list" diff --git a/po/hu.po b/po/hu.po index 7262b610..af0ddda2 100644 --- a/po/hu.po +++ b/po/hu.po @@ -370,16 +370,16 @@ msgid "\t\tMove to last commit" msgstr "\t\tUtols=C3=B3 commithoz" =20 #: gitk:2816 -msgid ", p, i\tMove up one commit" -msgstr ", p, i\tEgy committal feljebb" +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tEgy committal feljebb" =20 #: gitk:2817 -msgid ", n, k\tMove down one commit" -msgstr ", n, k\tEgy committal lejjebb" +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tEgy committal lejjebb" =20 #: gitk:2818 -msgid ", z, j\tGo back in history list" -msgstr ", z, j\tVissza a history list=C3=A1ba" +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tVissza a history list=C3=A1ba" =20 #: gitk:2819 msgid ", x, l\tGo forward in history list" diff --git a/po/it.po b/po/it.po index a730d63a..5f562109 100644 --- a/po/it.po +++ b/po/it.po @@ -372,16 +372,16 @@ msgid "\t\tMove to last commit" msgstr "\t\tVai all'ultima revisione" =20 #: gitk:2819 -msgid ", p, i\tMove up one commit" -msgstr ", p, i\tVai pi=C3=B9 in alto di una revisione" +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tVai pi=C3=B9 in alto di una revisione" =20 #: gitk:2820 -msgid ", n, k\tMove down one commit" -msgstr ", n, k\tVai pi=C3=B9 in basso di una revisione" +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tVai pi=C3=B9 in basso di una revisione" =20 #: gitk:2821 -msgid ", z, j\tGo back in history list" -msgstr ", z, j\tTorna indietro nella cronologia" +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tTorna indietro nella cronologia" =20 #: gitk:2822 msgid ", x, l\tGo forward in history list" diff --git a/po/ja.po b/po/ja.po index 4f470516..249ec150 100644 --- a/po/ja.po +++ b/po/ja.po @@ -372,16 +372,16 @@ msgid "\t\tMove to last commit" msgstr "\t\t=E6=9C=80=E5=BE=8C=E3=81=AE=E3=82=B3=E3=83=9F=E3=83=83= =E3=83=88=E3=81=AB=E7=A7=BB=E5=8B=95" =20 #: gitk:2693 -msgid ", p, i\tMove up one commit" -msgstr ", p, i\t=E4=B8=80=E3=81=A4=E4=B8=8A=E3=81=AE=E3=82=B3=E3=83= =9F=E3=83=83=E3=83=88=E3=81=AB=E7=A7=BB=E5=8B=95" +msgid ", p, k\tMove up one commit" +msgstr ", p, k\t=E4=B8=80=E3=81=A4=E4=B8=8A=E3=81=AE=E3=82=B3=E3=83= =9F=E3=83=83=E3=83=88=E3=81=AB=E7=A7=BB=E5=8B=95" =20 #: gitk:2694 -msgid ", n, k\tMove down one commit" -msgstr ", n, k\t=E4=B8=80=E3=81=A4=E4=B8=8B=E3=81=AE=E3=82=B3=E3= =83=9F=E3=83=83=E3=83=88=E3=81=AB=E7=A7=BB=E5=8B=95" +msgid ", n, j\tMove down one commit" +msgstr ", n, j\t=E4=B8=80=E3=81=A4=E4=B8=8B=E3=81=AE=E3=82=B3=E3= =83=9F=E3=83=83=E3=83=88=E3=81=AB=E7=A7=BB=E5=8B=95" =20 #: gitk:2695 -msgid ", z, j\tGo back in history list" -msgstr ", z, j\t=E5=B1=A5=E6=AD=B4=E3=81=AE=E5=89=8D=E3=81=AB=E6= =88=BB=E3=82=8B" +msgid ", z, h\tGo back in history list" +msgstr ", z, h\t=E5=B1=A5=E6=AD=B4=E3=81=AE=E5=89=8D=E3=81=AB=E6= =88=BB=E3=82=8B" =20 #: gitk:2696 msgid ", x, l\tGo forward in history list" diff --git a/po/ru.po b/po/ru.po index c3d0285b..e7e6e9ef 100644 --- a/po/ru.po +++ b/po/ru.po @@ -350,16 +350,16 @@ msgid "\t\tMove to last commit" msgstr "\t\t=D0=9F=D0=B5=D1=80=D0=B5=D0=B9=D1=82=D0=B8 =D0=BA =D0= =BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0=B5=D0=BC=D1=83 =D1=81=D0=BE=D1= =81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8E" =20 #: gitk:2646 -msgid ", p, i\tMove up one commit" -msgstr ", p, i\t=D0=9F=D0=B5=D1=80=D0=B5=D0=B9=D1=82=D0=B8 =D0=BA = =D1=81=D0=BB=D0=B5=D0=B4=D1=83=D1=8E=D1=89=D0=B5=D0=BC=D1=83 =D1=81=D0=BE= =D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8E" +msgid ", p, k\tMove up one commit" +msgstr ", p, k\t=D0=9F=D0=B5=D1=80=D0=B5=D0=B9=D1=82=D0=B8 =D0=BA = =D1=81=D0=BB=D0=B5=D0=B4=D1=83=D1=8E=D1=89=D0=B5=D0=BC=D1=83 =D1=81=D0=BE= =D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8E" =20 #: gitk:2647 -msgid ", n, k\tMove down one commit" -msgstr ", n, k\t=D0=9F=D0=B5=D1=80=D0=B5=D0=B9=D1=82=D0=B8 =D0=BA= =D0=BF=D1=80=D0=B5=D0=B4=D1=8B=D0=B4=D1=83=D1=89=D0=B5=D0=BC=D1=83 =D1= =81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8E" +msgid ", n, j\tMove down one commit" +msgstr ", n, j\t=D0=9F=D0=B5=D1=80=D0=B5=D0=B9=D1=82=D0=B8 =D0=BA= =D0=BF=D1=80=D0=B5=D0=B4=D1=8B=D0=B4=D1=83=D1=89=D0=B5=D0=BC=D1=83 =D1= =81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D1=8E" =20 #: gitk:2648 -msgid ", z, j\tGo back in history list" -msgstr ", z, j\t=D0=9F=D0=BE=D0=BA=D0=B0=D0=B7=D0=B0=D1=82=D1=8C= =D1=80=D0=B0=D0=BD=D0=B5=D0=B5 =D0=BF=D0=BE=D1=81=D0=B5=D1=89=D1=91=D0= =BD=D0=BD=D0=BE=D0=B5 =D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D0= =B5" +msgid ", z, h\tGo back in history list" +msgstr ", z, h\t=D0=9F=D0=BE=D0=BA=D0=B0=D0=B7=D0=B0=D1=82=D1=8C= =D1=80=D0=B0=D0=BD=D0=B5=D0=B5 =D0=BF=D0=BE=D1=81=D0=B5=D1=89=D1=91=D0= =BD=D0=BD=D0=BE=D0=B5 =D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D0= =B5" =20 #: gitk:2649 msgid ", x, l\tGo forward in history list" diff --git a/po/sv.po b/po/sv.po index 386763ad..8bd72f3d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -371,16 +371,16 @@ msgid "\t\tMove to last commit" msgstr "\t\tG=C3=A5 till sista incheckning" =20 #: gitk:2819 -msgid ", p, i\tMove up one commit" -msgstr ", p, i\tG=C3=A5 en incheckning upp" +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tG=C3=A5 en incheckning upp" =20 #: gitk:2820 -msgid ", n, k\tMove down one commit" -msgstr ", n, k\tG=C3=A5 en incheckning ned" +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tG=C3=A5 en incheckning ned" =20 #: gitk:2821 -msgid ", z, j\tGo back in history list" -msgstr ", z, j\tG=C3=A5 bak=C3=A5t i historiken" +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tG=C3=A5 bak=C3=A5t i historiken" =20 #: gitk:2822 msgid ", x, l\tGo forward in history list" --=20 1.7.7.rc1