1. Stefan Saasen
  2. git


Shawn O. Pearce  committed 83751fc

git-gui: Refactor diff popup into a procedure to ease i18n work

The folks working on the i18n version of git-gui have had some
trouble trying to convert these English strings into [mc] calls
due to the double evaluation. Moving this block into a standard
procedure eliminates the double evaluation, making their work

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

  • Participants
  • Parent commits 9c5a3c7
  • Branches master

Comments (0)

Files changed (1)

File git-gui.sh

View file
  • Ignore whitespace
 $ctxm add separator
 $ctxm add command -label {Options...} \
 	-command do_options
-bind_button3 $ui_diff "
-	set cursorX %x
-	set cursorY %y
-	if {\$ui_index eq \$current_diff_side} {
-		$ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
+proc popup_diff_menu {ctxm x y X Y} {
+	set ::cursorX $x
+	set ::cursorY $y
+	if {$::ui_index eq $::current_diff_side} {
+		$ctxm entryconf $::ui_diff_applyhunk \
+			-label {Unstage Hunk From Commit}
 	} else {
-		$ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
+		$ctxm entryconf $::ui_diff_applyhunk \
+			-label {Stage Hunk For Commit}
-	tk_popup $ctxm %X %Y
-unset ui_diff_applyhunk
+	tk_popup $ctxm $X $Y
+bind_button3 $ui_diff [list popup_diff_menu $ctxm %x %y %X %Y]
 # -- Status Bar