From 84b99b1b3db8f78afaee0f850f92606fd54b4ea0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 15 Jun 2018 15:00:09 +0530 Subject: [PATCH] diff kitten: Clear the search when pressing Esc --- docs/kittens/diff.rst | 3 ++- kittens/diff/main.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/kittens/diff.rst b/docs/kittens/diff.rst index f1cc1ef8f..bf277613e 100644 --- a/docs/kittens/diff.rst +++ b/docs/kittens/diff.rst @@ -67,7 +67,7 @@ Keyboard controls ========================= =========================== Action Shortcut ========================= =========================== -Quit :kbd:`q, Ctrl+c` +Quit :kbd:`q, Ctrl+c, Esc` Scroll line up :kbd:`k, up` Scroll line down :kbd:`j, down` Scroll page up :kbd:`PgUp` @@ -84,6 +84,7 @@ All lines of context :kbd:`a` Restore default context :kbd:`=` Search forwards :kbd:`/` Search backwards :kbd:`?` +Clear search :kbd:`Esc` Scroll to next match :kbd:`>, .` Scroll to previous match :kbd:`<, ,` ========================= =========================== diff --git a/kittens/diff/main.py b/kittens/diff/main.py index 57b083b18..2961b4999 100644 --- a/kittens/diff/main.py +++ b/kittens/diff/main.py @@ -390,6 +390,10 @@ class DiffHandler(Handler): self.line_edit.clear() self.draw_screen() 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) if action is not None: return self.perform_action(action)