[elpa] externals/objed 410a425 29/34: Refactor isearch handling and add missing commands

[Stefan Monnier]

branch: externals/objed
commit 410a4256b61f880167eed919e6064fcb85c7cbcf
Author: Clemens Radermacher <clem...@posteo.net>
Commit: Clemens Radermacher <clem...@posteo.net>

    Refactor isearch handling and add missing commands
---
 objed.el | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/objed.el b/objed.el
index 3b77313..b586aa6 100644
--- a/objed.el
+++ b/objed.el
@@ -301,9 +301,18 @@ This option holds the number of times `objed-last' can
 be used to restore previous states."
   :type 'integer)
 
+(defvar objed--isearch-cmds
+  '(isearch-forward
+    isearch-forward-regexp
+    isearch-forward-symbol
+    isearch-backward
+    isearch-backward-regexp
+    isearch-forward-symbol-at-point
+    isearch-forward-word)
+  "Isearch commands known to objed.")
 
 (defcustom objed-keeper-commands
-  '(save-buffer
+  `(save-buffer
     read-only-mode
     undo
     undo-only
@@ -315,11 +324,7 @@ be used to restore previous states."
     kmacro-start-macro-or-insert-counter
     kmacro-end-or-call-macro
     kmacro-call-macro
-    isearch-forward
-    isearch-forward-regexp
-    isearch-forward-symbol
-    isearch-backward
-    isearch-backward-regexp
+    ,@objed--isearch-cmds
     )
   "Regular Emacs commands which should not exit modal edit state.
 
@@ -327,6 +332,8 @@ When regular commands are executed `objed' will exit its 
editing
 state. Commands added to this list wont do that."
   :type '(repeat function))
 
+
+
 (defcustom objed-cursor-color "#e52b50"
   "Cursor color to use when `objed' is active."
   :type 'color)
@@ -1506,11 +1513,7 @@ one of `objed-keeper-commands'."
         objed--with-allow-input
         (and this-command
              ;; those are handled on exit in objed--reset--objed-buffer
-             (not (memq this-command '(isearch-forward
-                                       isearch-forward-regexp
-                                       isearch-forward-symbol
-                                       isearch-backward
-                                       isearch-backward-regexp)))
+             (not (memq this-command objed--isearch-cmds))
              (or (memq this-command objed-keeper-commands)
                  (assq this-command objed-cmd-alist))
              (prog1 #'ignore
@@ -3976,11 +3979,7 @@ Reset and reinitilize objed if appropriate."
             (kill-local-variable setting))))
       (remove-hook 'pre-command-hook 'objed--push-state t)
 
-      (when (and (memq this-command '(isearch-forward
-                                      isearch-forward-regexp
-                                      isearch-forward-symbol
-                                      isearch-backward
-                                      isearch-backward-regexp))
+      (when (and (memq this-command objed--isearch-cmds)
                  (memq this-command objed-keeper-commands))
         (add-hook 'isearch-mode-end-hook #'objed-reactivate-after-isearch))