Merge branch 'maint'

* maint:
git-gui: Don't quit when we destroy a child widget
Make the installation target of git-gui a little less chatty

diff --git a/Makefile b/Makefile
index 3de0de1a2341eedd67de5210fbf216d62fe9e464..404bff0ad9d04939e77ff516b018f71486d1acac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,12 @@ all::
 
 # Define V=1 to have a more verbose compile.
 #
+QUIET =
+QUIET_MSG = :
+ifndef V
+    QUIET = @
+    QUIET_MSG = echo '   '
+endif
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
        @$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -109,12 +115,14 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
 all:: $(ALL_PROGRAMS) lib/tclIndex
 
 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' ;)
-       $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
-       $(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)'
-       $(foreach p,$(ALL_LIBFILES), $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;)
+       $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+       $(QUIET)$(QUIET_MSG)INSTALL git-gui; $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+       $(QUIET)$(foreach p,$(GITGUI_BUILT_INS),$(QUIET_MSG)INSTALL $p;\
+           rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && \
+           ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+       $(QUIET)$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
+       $(QUIET)$(foreach p,lib/tclIndex $(ALL_LIBFILES), $(QUIET_MSG)INSTALL $p;\
+           $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;)
 
 dist-version:
        @mkdir -p $(TARDIR)

diff --git a/git-gui.sh b/git-gui.sh
index 5dc2c675a92b65598a02a74b4a27ba3db1f4f86f..264d9ff042d2250b98800ecdf77e33ebe2b8bde3 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1636,7 +1636,7 @@ unset browser doc_path doc_url
 
 # -- Standard bindings
 #
-bind .   <Destroy> do_quit
+bind .   <Destroy> {if {{%W} eq {.}} do_quit}
 bind all <$M1B-Key-q> do_quit
 bind all <$M1B-Key-Q> do_quit
 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}