diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-06-01 23:28:15 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-06-01 23:28:15 -0400 |
| commit | f7e1d2d4ac53e93fb2c79bd65c9f3dbfbc9c2024 (patch) | |
| tree | 77b9694b737de66e995a726b404f0a0ee7969067 | |
| parent | fc4e8da727d5c1737322b14386282456fd3c99c9 (diff) | |
| parent | 160e82284eda034fea84dcc946f9c1965176f25f (diff) | |
| download | git-f7e1d2d4ac53e93fb2c79bd65c9f3dbfbc9c2024.tar.gz git-f7e1d2d4ac53e93fb2c79bd65c9f3dbfbc9c2024.tar.xz | |
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
| -rw-r--r-- | Makefile | 20 | ||||
| -rwxr-xr-x | git-gui.sh | 2 |
2 files changed, 15 insertions, 7 deletions
@@ -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 5dc2c675a..264d9ff04 100755 --- 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]} |