From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 30 Mar 2009 14:09:28 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3-rc4~1^2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/122ee5442039fd006911cd964b149c776476ee8d?hp=966d0778db2e3b11f5fffa2312770ef534263058

Merge branch 'maint'

* maint:
git-gui: fix deleting from the context menu with empty selection
---

diff --git a/git-gui.sh b/git-gui.sh
index 2f1f305019..b3aa7325f0 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -2944,7 +2944,7 @@ $ctxm add command \
 	-command {tk_textPaste $ui_comm}
 $ctxm add command \
 	-label [mc Delete] \
-	-command {$ui_comm delete sel.first sel.last}
+	-command {catch {$ui_comm delete sel.first sel.last}}
 $ctxm add separator
 $ctxm add command \
 	-label [mc "Select All"] \