From: Pratyush Yadav <me@yadavpratyush.com>
Date: Sat, 14 Sep 2019 17:53:12 +0000 (+0530)
Subject: Merge branch 'bp/amend-toggle-bind'
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f7a8834ba4aa20ec750833cf8d30d9a9fed5eade?ds=inline;hp=-c

Merge branch 'bp/amend-toggle-bind'

Toggle amend on and off with the keyboard shortcut "Ctrl+e".

* bp/amend-toggle-bind:
git-gui: add hotkey to toggle "Amend Last Commit"
---

f7a8834ba4aa20ec750833cf8d30d9a9fed5eade
diff --combined git-gui.sh
index 8ecb98b09b,c345b5c6be..c75b3e90bc
--- a/git-gui.sh
+++ b/git-gui.sh
@@@ -2664,6 -2664,12 +2664,12 @@@ proc focus_widget {widget} 
  	}
  }
  
+ proc toggle_commit_type {} {
+ 	global commit_type_is_amend
+ 	set commit_type_is_amend [expr !$commit_type_is_amend]
+ 	do_select_commit_type
+ }
+ 
  ######################################################################
  ##
  ## ui construction
@@@ -2854,6 -2860,7 +2860,7 @@@ if {[is_enabled multicommit] || [is_ena
  	if {![is_enabled nocommit]} {
  		.mbar.commit add checkbutton \
  			-label [mc "Amend Last Commit"] \
+ 			-accelerator $M1T-E \
  			-variable commit_type_is_amend \
  			-command do_select_commit_type
  		lappend disable_on_lock \
@@@ -3369,16 -3376,10 +3376,16 @@@ ttext $ui_comm -background white -foreg
  	-relief sunken \
  	-width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
  	-font font_diff \
 +	-xscrollcommand {.vpane.lower.commarea.buffer.frame.sbx set} \
  	-yscrollcommand {.vpane.lower.commarea.buffer.frame.sby set}
 +${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sbx \
 +	-orient horizontal \
 +	-command [list $ui_comm xview]
  ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
 +	-orient vertical \
  	-command [list $ui_comm yview]
  
 +pack .vpane.lower.commarea.buffer.frame.sbx -side bottom -fill x
  pack .vpane.lower.commarea.buffer.frame.sby -side right -fill y
  pack $ui_comm -side left -fill y
  pack .vpane.lower.commarea.buffer.header -side top -fill x
@@@ -3898,6 -3899,8 +3905,8 @@@ bind .   <$M1B-Key-j> do_revert_selecti
  bind .   <$M1B-Key-J> do_revert_selection
  bind .   <$M1B-Key-i> do_add_all
  bind .   <$M1B-Key-I> do_add_all
+ bind .   <$M1B-Key-e> toggle_commit_type
+ bind .   <$M1B-Key-E> toggle_commit_type
  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}