summaryrefslogtreecommitdiff
path: root/lisp/isearch.el
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2013-12-20 00:12:12 +0200
committerJuri Linkov <juri@jurta.org>2013-12-20 00:12:12 +0200
commit50ab1da6d67215219c4a26a045edcad28fa0b096 (patch)
treecaf66ad4c39ffd6b7818a9a4094eb2915b28a807 /lisp/isearch.el
parent3d6e95e7673bf1352a439cdd705eae00e65a0542 (diff)
downloademacs-50ab1da6d67215219c4a26a045edcad28fa0b096.tar.gz
* lisp/isearch.el (isearch-mode-map): Bind `M-s e' to `isearch-edit-string'.
Put :advertised-binding on `M-s c', `M-s r', `M-s e'. (Bug#16035) (minibuffer-history-symbol): Move variable declaration closer to its usage. * lisp/isearchb.el (isearchb): Add `event-basic-type' on `last-command-event'. (Bug#14785) * lisp/gnus/gnus.el (gnus-suppress-keymap): * lisp/gnus/gnus-art.el (gnus-article-mode-map): * lisp/gnus/gnus-group.el (gnus-group-mode-map): * lisp/gnus/gnus-sum.el (gnus-summary-mode-map, gnus-summary-backend-map): Remove [backspace] key binding because it shadows DEL (bug#16035). * lisp/gnus/mm-decode.el (mm-viewer-completion-map): Remove duplicate definition.
Diffstat (limited to 'lisp/isearch.el')
-rw-r--r--lisp/isearch.el9
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 54cf7d17a75..f222c8f59cd 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -500,6 +500,11 @@ This is like `describe-bindings', but displays only Isearch keys."
(define-key map "\M-r" 'isearch-toggle-regexp)
(define-key map "\M-e" 'isearch-edit-string)
+ (put 'isearch-toggle-case-fold :advertised-binding "\M-sc")
+ (put 'isearch-toggle-regexp :advertised-binding "\M-sr")
+ (put 'isearch-edit-string :advertised-binding "\M-se")
+
+ (define-key map "\M-se" 'isearch-edit-string)
(define-key map "\M-sc" 'isearch-toggle-case-fold)
(define-key map "\M-si" 'isearch-toggle-invisible)
(define-key map "\M-sr" 'isearch-toggle-regexp)
@@ -1146,8 +1151,6 @@ nonincremental search instead via `isearch-edit-string'."
(isearch-done)
(isearch-clean-overlays))
-(defvar minibuffer-history-symbol) ;; from external package gmhist.el
-
(defun isearch-fail-pos (&optional msg)
"Return position of first mismatch in search string, or nil if none.
If MSG is non-nil, use variable `isearch-message', otherwise `isearch-string'."
@@ -1300,6 +1303,8 @@ You can update the global isearch variables by setting new values to
(isearch-abort) ;; outside of let to restore outside global values
)))
+(defvar minibuffer-history-symbol) ;; from external package gmhist.el
+
(defun isearch-edit-string ()
"Edit the search string in the minibuffer.
The following additional command keys are active while editing.