Commit 50ab1da6 authored by Juri Linkov's avatar Juri Linkov
Browse files

* 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.
parent 3d6e95e7
2013-12-19 Juri Linkov <juri@jurta.org>
* 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.
* isearchb.el (isearchb): Add `event-basic-type' on `last-command-event'.
(Bug#14785)
2013-12-19 Juri Linkov <juri@jurta.org>
* vc/log-edit.el (log-edit-insert-filenames-without-changelog):
......
2013-12-19 Juri Linkov <juri@jurta.org>
* gnus.el (gnus-suppress-keymap):
* gnus-art.el (gnus-article-mode-map):
* gnus-group.el (gnus-group-mode-map):
* gnus-sum.el (gnus-summary-mode-map, gnus-summary-backend-map):
Remove [backspace] key binding because it shadows DEL (bug#16035).
* mm-decode.el (mm-viewer-completion-map): Remove duplicate definition.
2013-12-19 Katsumi Yamaoka <yamaoka@jpl.org>
 
* gnus-uu.el (gnus-uu-decode-binhex, gnus-uu-decode-binhex-view):
......
......@@ -4395,7 +4395,6 @@ If variable `gnus-use-long-file-name' is non-nil, it is
[?\S-\ ] gnus-article-goto-prev-page
"\177" gnus-article-goto-prev-page
[delete] gnus-article-goto-prev-page
[backspace] gnus-article-goto-prev-page
"\C-c^" gnus-article-refer-article
"h" gnus-article-show-summary
"s" gnus-article-show-summary
......
......@@ -571,7 +571,6 @@ simple manner.")
"p" gnus-group-prev-unread-group
"\177" gnus-group-prev-unread-group
[delete] gnus-group-prev-unread-group
[backspace] gnus-group-prev-unread-group
"N" gnus-group-next-group
"P" gnus-group-prev-group
"\M-n" gnus-group-next-unread-group-same-level
......
......@@ -1850,7 +1850,6 @@ increase the score of each group you read."
[?\S-\ ] gnus-summary-prev-page
"\177" gnus-summary-prev-page
[delete] gnus-summary-prev-page
[backspace] gnus-summary-prev-page
"\r" gnus-summary-scroll-up
"\M-\r" gnus-summary-scroll-down
"n" gnus-summary-next-unread-article
......@@ -2222,7 +2221,6 @@ increase the score of each group you read."
"\M-\C-e" gnus-summary-expire-articles-now
"\177" gnus-summary-delete-article
[delete] gnus-summary-delete-article
[backspace] gnus-summary-delete-article
"m" gnus-summary-move-article
"r" gnus-summary-respool-article
"w" gnus-summary-edit-article
......
......@@ -3035,7 +3035,7 @@ See Info node `(gnus)Formatting Variables'."
(defun gnus-suppress-keymap (keymap)
(suppress-keymap keymap)
(let ((keys `([backspace] [delete] "\177" "\M-u"))) ;gnus-mouse-2
(let ((keys `([delete] "\177" "\M-u"))) ;gnus-mouse-2
(while keys
(define-key keymap (pop keys) 'undefined))))
......
......@@ -538,14 +538,6 @@ result of the verification."
map)
"Keymap for input viewer with completion.")
(defvar mm-viewer-completion-map
(let ((map (make-sparse-keymap 'mm-viewer-completion-map)))
(set-keymap-parent map minibuffer-local-completion-map)
;; Should we bind other key to minibuffer-complete-word?
(define-key map " " 'self-insert-command)
map)
"Keymap for input viewer with completion.")
;;; The functions.
(defun mm-alist-to-plist (alist)
......
......@@ -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.
......
......@@ -139,7 +139,8 @@ Its purpose is to pass different call arguments to
(if last-command-event
(setq iswitchb-rescan t
iswitchb-text (concat iswitchb-text
(char-to-string last-command-event))))
(char-to-string
(event-basic-type last-command-event)))))
(iswitchb-set-matches)
(let* ((match (car iswitchb-matches))
(buf (and match (get-buffer match))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment