[elpa] scratch/mheerdegen-preview 60fd31c 19/33: WIP [el-search] Adjust prev/next match commands for search and occur

[Michael Heerdegen]

branch: scratch/mheerdegen-preview
commit 60fd31c349489bb7208c6e8aaf50e70a0af1da37
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>

    WIP [el-search] Adjust prev/next match commands for search and occur
---
 packages/el-search/el-search.el | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index f60879b..0e19b84 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -116,7 +116,7 @@
 ;;   C-O or M-RET (from a search pattern prompt)
 ;;     Execute this search command as occur.
 ;;
-;;   C-N, M-s e n (el-search-continue-in-next-buffer)
+;;   C-X, M-s e x (el-search-continue-in-next-buffer)
 ;;     Skip over current buffer or file.
 ;;
 ;;   C-D, M-s e d (el-search-skip-directory)
@@ -251,7 +251,7 @@
 ;; `el-search-jump-to-search-head' (C-J; M-s e j): this command jumps
 ;; to the last match and re-activates the search.
 ;;
-;; `el-search-continue-in-next-buffer' (C-N; n) skips all remaining
+;; `el-search-continue-in-next-buffer' (C-X; x) skips all remaining
 ;; matches in the current buffer and continues searching in the next
 ;; buffer.  `el-search-skip-directory' (C-D; d) even skips all
 ;; subsequent files under a specified directory.
@@ -1906,6 +1906,8 @@ in, in order, when called with no arguments."
 
     (keybind emacs-lisp-mode-map           ?s #'el-search-pattern)
     (keybind emacs-lisp-mode-map           ?r #'el-search-pattern-backward)
+    (keybind emacs-lisp-mode-map           ?n #'el-search-pattern)
+    (keybind emacs-lisp-mode-map           ?p #'el-search-pattern-backward)
     (keybind emacs-lisp-mode-map           ?% #'el-search-query-replace)
     (keybind emacs-lisp-mode-map           ?t #'el-search-this-sexp)
     (keybind global-map                    ?j #'el-search-jump-to-search-head)
@@ -1913,7 +1915,7 @@ in, in order, when called with no arguments."
     (keybind global-map                    ?< #'el-search-from-beginning)
     (keybind emacs-lisp-mode-map           ?> #'el-search-last-buffer-match)
     (keybind global-map                    ?d #'el-search-skip-directory)
-    (keybind global-map                    ?n 
#'el-search-continue-in-next-buffer)
+    (keybind global-map                    ?x 
#'el-search-continue-in-next-buffer)
 
     (keybind global-map                    ?o #'el-search-occur)
     (keybind emacs-lisp-mode-map           ?h #'el-search-highlight-pattern)
@@ -3410,6 +3412,8 @@ Prompt for a new pattern and revert."
     (define-key map [(shift tab)]   #'el-search-occur-cycle)
     (define-key map [?p]            #'el-search-occur-previous-match)
     (define-key map [?n]            #'el-search-occur-next-match)
+    (define-key map [?r]            #'el-search-occur-previous-match)
+    (define-key map [?s]            #'el-search-occur-next-match)
     (define-key map [?e]            #'el-search-edit-occur-pattern)
     (define-key map [?c ?n]         #'el-search-occur-no-context)
     (define-key map [?c ?d]         #'el-search-occur-defun-context)