summaryrefslogtreecommitdiff
path: root/git-gui/lib/search.tcl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-16 03:01:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-16 03:01:44 -0700
commit47d45a5ebd5bce543a50546d05e8b92c6971acda (patch)
tree9b386fabbcb80dd7993e94a3c189ed21b9b03147 /git-gui/lib/search.tcl
parentgit-svn: Allow certain refs to be ignored (diff)
parentgit-gui: incremental goto line in blame view (diff)
downloadtgif-47d45a5ebd5bce543a50546d05e8b92c6971acda.tar.xz
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: incremental goto line in blame view git-gui: clear the goto line input when hiding git-gui: only accept numbers in the goto-line input git-gui: search and linenumber input are mutual exclusive in the blame view git-gui: deal with unknown files when pressing the "Stage Changed" button git-gui: drop the 'n' and 'Shift-n' bindings from the last patch. git-gui: Add keyboard shortcuts for search and goto commands in blame view. git-gui: Enable jumping to a specific line number in blame view. Fix tooltip display with multiple monitors on windows. Fix typo: existant->existent git-gui: updated translator README for current procedures. git-gui: warn when trying to commit on a detached head git-gui: Corrected a typo in the Swedish translation of 'Continue'
Diffstat (limited to 'git-gui/lib/search.tcl')
-rw-r--r--git-gui/lib/search.tcl4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-gui/lib/search.tcl b/git-gui/lib/search.tcl
index 7fdbf87bcd..ef3486f083 100644
--- a/git-gui/lib/search.tcl
+++ b/git-gui/lib/search.tcl
@@ -35,6 +35,8 @@ constructor new {i_w i_text args} {
grid remove $w
trace add variable searchstring write [cb _incrsearch_cb]
+ bind $w.ent <Return> [cb find_next]
+ bind $w.ent <Shift-Return> [cb find_prev]
bind $w <Destroy> [list delete_this $this]
return $this
@@ -196,4 +198,4 @@ method scrolled {} {
}
}
-} \ No newline at end of file
+}