diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-21 21:15:04 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-21 21:15:04 +0300 |
| commit | ae92ac8ae3838e72840f5d019195bb9c0c9e7b0e (patch) | |
| tree | a714586ef9da37deecf3861b2400f7c34dae19af /git-gui/git-gui.sh | |
| parent | 87680d32efb6d14f162e54ad3bda4e3d6c908559 (diff) | |
| parent | c195247812f8cd38ba7e1c603112e6c1d8d8e71e (diff) | |
Merge https://github.com/prati0100/git-gui
* https://github.com/prati0100/git-gui:
git-gui: Handle Ctrl + BS/Del in the commit msg
Subject: git-gui: fix syntax error because of missing semicolon
Diffstat (limited to 'git-gui/git-gui.sh')
| -rwxr-xr-x | git-gui/git-gui.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 4610e4ca72..49bd86e635 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -2600,12 +2600,12 @@ proc toggle_or_diff {mode w args} { update_indexinfo \ "Unstaging [short_path $path] from commit" \ [list $path] \ - [concat $after [list ui_ready]] + [concat $after {ui_ready;}] } elseif {$w eq $ui_workdir} { update_index \ "Adding [short_path $path]" \ [list $path] \ - [concat $after [list ui_ready]] + [concat $after {ui_ready;}] } } else { set selected_paths($path) 1 @@ -3928,6 +3928,8 @@ 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_comm <$M1B-Key-BackSpace> {event generate %W <Meta-Delete>;break} +bind $ui_comm <$M1B-Key-Delete> {event generate %W <Meta-d>;break} bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break} bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break} |