From d78a819cb7e75229d44ea80593e6f26d8bda0ee3 Mon Sep 17 00:00:00 2001 From: "Mingde (Matthew) Zeng" Date: Thu, 6 Aug 2020 23:06:56 -0400 Subject: [PATCH] browser: enhance action_quit to caret_exit when necessary Signed-off-by: Mingde (Matthew) Zeng --- core/browser.py | 6 +++++- eaf.el | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/browser.py b/core/browser.py index 4c57d33..1c231ce 100644 --- a/core/browser.py +++ b/core/browser.py @@ -218,12 +218,16 @@ class BrowserView(QWebEngineView): else: self._search_text(self.search_term, True) + @interactive() def action_quit(self): ''' Quit action.''' if self.search_term != "": self._search_text("") if self.buffer.caret_browsing_mode: - self.buffer.caret_toggle_mark() + if self.buffer.caret_browsing_mark_activated: + self.buffer.caret_toggle_mark() + else: + self.buffer.caret_exit() def select_text_change(self): ''' Change selected text.''' diff --git a/eaf.el b/eaf.el index cab0bc3..ea90bde 100644 --- a/eaf.el +++ b/eaf.el @@ -320,9 +320,7 @@ Try not to modify this alist directly. Use `eaf-setq' to modify instead." ("C-q" . "caret_exit") ("c" . "insert_or_caret_at_line") ("M-c" . "caret_toggle_browsing") - ("" . "caret_exit") - ("C-g" . "caret_exit") - ) + ("" . "caret_exit")) "The keybinding of EAF Browser Caret Mode." :type 'cons)