From 83751fc109e951a5cbde9ee39970f6b1d2da07c7 Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <spearce@spearce.org>
Date: Mon, 23 Jul 2007 00:36:39 -0400
Subject: [PATCH] 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
easier.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 git-gui.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/git-gui.sh b/git-gui.sh
index 67aed3ada..2912872d2 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -2418,17 +2418,19 @@ lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 $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
 #
-- 
2.26.2