diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-06-20 23:27:08 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-06-20 23:27:08 -0400 |
| commit | fe813d4e80426971ce17f6ea03f97bc1e26383a1 (patch) | |
| tree | e40d9ae21a315f3b7b8785856e10b15d848e02f9 | |
| parent | 573fe6d77da51f7baa20800a3809b5db9296a83c (diff) | |
| parent | fb626dc00044c106652ae39300b4cb613af70ab1 (diff) | |
| download | git-fe813d4e80426971ce17f6ea03f97bc1e26383a1.tar.gz git-fe813d4e80426971ce17f6ea03f97bc1e26383a1.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Bind Tab/Shift-Tab to cycle between panes in blame
git-gui: Correctly install to /usr/bin on Cygwin
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | lib/blame.tcl | 6 |
2 files changed, 12 insertions, 2 deletions
@@ -7,6 +7,8 @@ GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE @$(SHELL_PATH) ./GIT-VERSION-GEN -include GIT-VERSION-FILE +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') + SCRIPT_SH = git-gui.sh GITGUI_BUILT_INS = git-citool ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH)) @@ -82,8 +84,12 @@ exedir_SQ = $(subst ','\'',$(exedir)) $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh $(QUIET_GEN)rm -f $@ $@+ && \ + GITGUI_RELATIVE= && \ if test '$(exedir_SQ)' = '$(libdir_SQ)'; then \ - GITGUI_RELATIVE=1; \ + if test "$(uname_O)" = Cygwin; \ + then GITGUI_RELATIVE= ; \ + else GITGUI_RELATIVE=1; \ + fi; \ fi && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|^exec wish "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \ diff --git a/lib/blame.tcl b/lib/blame.tcl index 139171d39..076233c3c 100644 --- a/lib/blame.tcl +++ b/lib/blame.tcl @@ -272,6 +272,8 @@ constructor new {i_commit i_path} { set cursorW %W tk_popup $w.ctxm %X %Y " + bind $i <Shift-Tab> "[list focus $w_cviewer];break" + bind $i <Tab> "[list focus $w_cviewer];break" } foreach i [concat $w_columns $w_cviewer] { @@ -287,8 +289,10 @@ constructor new {i_commit i_path} { bind $i <Control-Key-f> {catch {%W yview scroll 1 pages};break} } + bind $w_cviewer <Shift-Tab> "[list focus $w_file];break" + bind $w_cviewer <Tab> "[list focus $w_file];break" bind $w_cviewer <Button-1> [list focus $w_cviewer] - bind $top <Visibility> [list focus $top] + bind $w_file <Visibility> [list focus $w_file] grid configure $w.header -sticky ew grid configure $w.file_pane -sticky nsew |