[elpa] isearch-mb 44b9aa3 4/7: Use remapping in minibuffer keymap

[Stefan Monnier]

branch: isearch-mb
commit 44b9aa34a62488a89a871f10d608a8fdfcdbfc91
Author: Augusto Stoffel <arstoffel@gmail.com>
Commit: Augusto Stoffel <arstoffel@gmail.com>

    Use remapping in minibuffer keymap
    
    Additionally remap next/previous-line-or-history-element to forward/backward
    
    Closes https://github.com/astoff/isearch-mb/issues/5
    
    See also https://github.com/astoff/isearch-mb/pull/8
---
 isearch-mb.el | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/isearch-mb.el b/isearch-mb.el
index 6d5e441..bf4cf89 100644
--- a/isearch-mb.el
+++ b/isearch-mb.el
@@ -69,25 +69,26 @@
   "List of commands that shouldn't trigger a search.")
 
 (defvar isearch-mb-minibuffer-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map minibuffer-local-map)
-    (define-key map "\C-j" 'newline)
-    (define-key map "\C-s" 'isearch-repeat-forward)
-    (define-key map "\C-r" 'isearch-repeat-backward)
-    (define-key map "\M-%" 'isearch-query-replace)
-    (define-key map [?\C-\M-%] 'isearch-query-replace-regexp)
-    (define-key map "\M-<" 'isearch-beginning-of-buffer)
-    (define-key map "\M->" 'isearch-end-of-buffer)
-    (define-key map "\M-s'" 'isearch-toggle-char-fold)
-    (define-key map "\M-s " 'isearch-toggle-lax-whitespace)
-    (define-key map "\M-s_" 'isearch-toggle-symbol)
-    (define-key map "\M-sc" 'isearch-toggle-case-fold)
-    (define-key map "\M-shr" 'isearch-highlight-regexp)
-    (define-key map "\M-shl" 'isearch-highlight-lines-matching-regexp)
-    (define-key map "\M-si" 'isearch-toggle-invisible)
-    (define-key map "\M-so" 'isearch-occur)
-    (define-key map "\M-sr" 'isearch-toggle-regexp)
-    (define-key map "\M-sw" 'isearch-toggle-word)
+  (let ((map (make-composed-keymap nil minibuffer-local-map)))
+    (define-key map [remap next-line-or-history-element] 
#'isearch-repeat-forward)
+    (define-key map [remap previous-line-or-history-element] 
#'isearch-repeat-backward)
+    (define-key map [remap minibuffer-beginning-of-buffer] 
#'isearch-beginning-of-buffer)
+    (define-key map [remap end-of-buffer] #'isearch-end-of-buffer)
+    (define-key map [remap query-replace] #'isearch-query-replace)
+    (define-key map [remap query-replace-regexp] 
#'isearch-query-replace-regexp)
+    (define-key map "\C-j" #'newline)
+    (define-key map "\C-s" #'isearch-repeat-forward)
+    (define-key map "\C-r" #'isearch-repeat-backward)
+    (define-key map "\M-s#'" #'isearch-toggle-char-fold)
+    (define-key map "\M-s " #'isearch-toggle-lax-whitespace)
+    (define-key map "\M-s_" #'isearch-toggle-symbol)
+    (define-key map "\M-sc" #'isearch-toggle-case-fold)
+    (define-key map "\M-shr" #'isearch-highlight-regexp)
+    (define-key map "\M-shl" #'isearch-highlight-lines-matching-regexp)
+    (define-key map "\M-si" #'isearch-toggle-invisible)
+    (define-key map "\M-so" #'isearch-occur)
+    (define-key map "\M-sr" #'isearch-toggle-regexp)
+    (define-key map "\M-sw" #'isearch-toggle-word)
     map)
   "Minibuffer keymap used by Isearch-Mb.")