KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

diff kitten: Clear the search when pressing Esc

Browse Source
This commit is contained in:
Kovid Goyal
2018-06-15 15:00:09 +05:30
parent 1022d8a0ee
commit 84b99b1b3d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/kittens/diff.rst
View File

@@ -67,7 +67,7 @@ Keyboard controls
========================= =========================== ========================= ===========================
Action Shortcut Action Shortcut
========================= =========================== ========================= ===========================
Quit :kbd:`q, Ctrl+c` Quit :kbd:`q, Ctrl+c, Esc`
Scroll line up :kbd:`k, up` Scroll line up :kbd:`k, up`
Scroll line down :kbd:`j, down` Scroll line down :kbd:`j, down`
Scroll page up :kbd:`PgUp` Scroll page up :kbd:`PgUp`
@@ -84,6 +84,7 @@ All lines of context :kbd:`a`
Restore default context :kbd:`=` Restore default context :kbd:`=`
Search forwards :kbd:`/` Search forwards :kbd:`/`
Search backwards :kbd:`?` Search backwards :kbd:`?`
Clear search :kbd:`Esc`
Scroll to next match :kbd:`>, .` Scroll to next match :kbd:`>, .`
Scroll to previous match :kbd:`<, ,` Scroll to previous match :kbd:`<, ,`
========================= =========================== ========================= ===========================

4
kittens/diff/main.py
View File

@@ -390,6 +390,10 @@ class DiffHandler(Handler):
self.line_edit.clear() self.line_edit.clear()
self.draw_screen() self.draw_screen()
return return
if self.state >= DIFFED and self.current_search is not None and key_event.key is ESCAPE:
self.current_search = None
self.draw_screen()
return
action = self.shortcut_action(key_event) action = self.shortcut_action(key_event)
if action is not None: if action is not None:
return self.perform_action(action) return self.perform_action(action)