diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-04 22:38:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-04 22:38:32 -0700 |
| commit | 77ad7a49d3cc946487ca759e5361effbcfb03be5 (patch) | |
| tree | 7cc21a3377d318ad09e04728beac5f9416ed56d1 /git-gui/git-gui.sh | |
| parent | 6c41b80153a2e4ee347d0e968ee8d0d9abfc8862 (diff) | |
| parent | 729ffa50f75a025935623bfc58d0932c65f7de2f (diff) | |
| download | git-77ad7a49d3cc946487ca759e5361effbcfb03be5.tar.gz git-77ad7a49d3cc946487ca759e5361effbcfb03be5.tar.xz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: use +/- instead of ]/[ to show more/less context in diff
git-gui: Update french translation
git-gui: Switch keybindings for [ and ] to bracketleft and bracketright
Diffstat (limited to 'git-gui/git-gui.sh')
| -rwxr-xr-x | git-gui/git-gui.sh | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 8225cec50..7c25bb980 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -2064,11 +2064,11 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} { .mbar.commit add command -label [mc "Show Less Context"] \ -command show_less_context \ - -accelerator $M1T-\[ + -accelerator $M1T-\- .mbar.commit add command -label [mc "Show More Context"] \ -command show_more_context \ - -accelerator $M1T-\] + -accelerator $M1T-= .mbar.commit add separator @@ -2715,8 +2715,11 @@ bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break} bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break} bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break} bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break} -bind $ui_comm <$M1B-Key-\[> {show_less_context;break} -bind $ui_comm <$M1B-Key-\]> {show_more_context;break} +bind $ui_comm <$M1B-Key-minus> {show_less_context;break} +bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break} +bind $ui_comm <$M1B-Key-equal> {show_more_context;break} +bind $ui_comm <$M1B-Key-plus> {show_more_context;break} +bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break} bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break} bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break} @@ -2760,8 +2763,11 @@ bind . <$M1B-Key-t> do_add_selection bind . <$M1B-Key-T> do_add_selection bind . <$M1B-Key-i> do_add_all bind . <$M1B-Key-I> do_add_all -bind . <$M1B-Key-\[> {show_less_context;break} -bind . <$M1B-Key-\]> {show_more_context;break} +bind . <$M1B-Key-minus> {show_less_context;break} +bind . <$M1B-Key-KP_Subtract> {show_less_context;break} +bind . <$M1B-Key-equal> {show_more_context;break} +bind . <$M1B-Key-plus> {show_more_context;break} +bind . <$M1B-Key-KP_Add> {show_more_context;break} bind . <$M1B-Key-Return> do_commit foreach i [list $ui_index $ui_workdir] { bind $i <Button-1> "toggle_or_diff $i %x %y; break" |