Merge branch 'master' of git://repo.or.cz/git-gui

* 'master' of git://repo.or.cz/git-gui:
  git-gui: Honor TCLTK_PATH if supplied
  Revert "Allow wish interpreter to be defined with TCLTK_PATH"
  git-gui: Display the directory basename in the title
  git-gui: Brown paper bag fix division by 0 in blame
  Always bind the return key to the default button
  Do not break git-gui messages into multiple lines.
  Improve look-and-feel of the git-gui tool.
  Teach git-gui to use the user-defined UI font everywhere.
  Allow wish interpreter to be defined with TCLTK_PATH

diff --cc git-gui/Makefile
index b82789ead6255b33be0f1ed2029a91611cea3072,0000000000000000000000000000000000000000..b29d7d1e68d2489fd07612c8d0062d3491f04719
mode 100644,000000..100644
--- 1/git-gui/Makefile
--- /dev/null
+++ b/git-gui/Makefile
@@@ -1,69 -1,0 +1,73 @@@
 +all::
 +
 +# Define V=1 to have a more verbose compile.
 +#
 +
 +GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 +      @$(SHELL_PATH) ./GIT-VERSION-GEN
 +-include GIT-VERSION-FILE
 +
 +SCRIPT_SH = git-gui.sh
 +GITGUI_BUILT_INS = git-citool
 +ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH))
 +
 +ifndef SHELL_PATH
 +      SHELL_PATH = /bin/sh
 +endif
 +
 +ifndef gitexecdir
 +      gitexecdir := $(shell git --exec-path)
 +endif
 +
 +ifndef INSTALL
 +      INSTALL = install
 +endif
 +
 +ifndef V
 +      QUIET_GEN      = @echo '   ' GEN $@;
 +      QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
 +endif
 +
++TCLTK_PATH ?= wish
++
 +ifeq ($(findstring $(MAKEFLAGS),s),s)
 +QUIET_GEN =
 +QUIET_BUILT_IN =
 +endif
 +
 +DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 +SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
++TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 +
 +$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
 +      $(QUIET_GEN)rm -f $@ $@+ && \
 +      sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
++              -e 's|^exec wish "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \
 +              -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
 +              $@.sh >$@+ && \
 +      chmod +x $@+ && \
 +      mv $@+ $@
 +
 +$(GITGUI_BUILT_INS): git-gui
 +      $(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@
 +
 +# These can record GITGUI_VERSION
 +$(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE
 +
 +all:: $(ALL_PROGRAMS)
 +
 +install: all
 +      $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +      $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +      $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
 +
 +dist-version:
 +      @mkdir -p $(TARDIR)
 +      @echo $(GITGUI_VERSION) > $(TARDIR)/version
 +
 +clean::
 +      rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE
 +
 +.PHONY: all install dist-version clean
 +.PHONY: .FORCE-GIT-VERSION-FILE

diff --cc git-gui/git-gui.sh
Simple merge