From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 3 Jun 2007 01:05:13 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc0~44^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22faa032cae39b6758c5a83778bf9bd87305bbd4;p=git.git

Merge branch 'maint'

* maint:
  Revert "Make the installation target of git-gui a little less chatty"
  git-gui: Verify Tcl/Tk is new enough for our needs
  git-gui: Attach font_ui to all spinbox widgets
---

22faa032cae39b6758c5a83778bf9bd87305bbd4
diff --cc git-gui.sh
index 264d9ff04,cc1625bfa..7488a397a
--- a/git-gui.sh
+++ b/git-gui.sh
@@@ -20,24 -20,22 +20,40 @@@ You should have received a copy of the 
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA}
  
+ ######################################################################
+ ##
+ ## Tcl/Tk sanity check
+ 
+ if {[catch {package require Tcl 8.4} err]
+  || [catch {package require Tk  8.4} err]
+ } {
+ 	catch {wm withdraw .}
+ 	tk_messageBox \
+ 		-icon error \
+ 		-type ok \
+ 		-title "git-gui: fatal error" \
+ 		-message $err
+ 	exit 1
+ }
+ 
 +######################################################################
 +##
 +## enable verbose loading?
 +
 +if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
 +	unset _verbose
 +	rename auto_load real__auto_load
 +	proc auto_load {name args} {
 +		puts stderr "auto_load $name"
 +		return [uplevel 1 real__auto_load $name $args]
 +	}
 +	rename source real__source
 +	proc source {name} {
 +		puts stderr "source    $name"
 +		uplevel 1 real__source $name
 +	}
 +}
 +
  ######################################################################
  ##
  ## configure our library