[Emacs-diffs] trunk r115618: * lisp/isearch.el (isearch-mode-map): Bind `M-s e' to `isearch-edit-string'.

[Juri Linkov]

------------------------------------------------------------
revno: 115618
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16035
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-20 00:12:12 +0200
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus-art.el          gnusart.el-20091113204419-o5vbwnq5f7feedwu-1108
  lisp/gnus/gnus-group.el        
gnusgroup.el-20091113204419-o5vbwnq5f7feedwu-1120
  lisp/gnus/gnus-sum.el          gnussum.el-20091113204419-o5vbwnq5f7feedwu-1137
  lisp/gnus/gnus.el              gnus.el-20091113204419-o5vbwnq5f7feedwu-1144
  lisp/gnus/mm-decode.el         
mmdecode.el-20091113204419-o5vbwnq5f7feedwu-1971
  lisp/isearch.el                isearch.el-20091113204419-o5vbwnq5f7feedwu-486
  lisp/isearchb.el               
isearchb.el-20091113204419-o5vbwnq5f7feedwu-3015

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-19 21:10:41 +0000
+++ b/lisp/ChangeLog    2013-12-19 22:12:12 +0000
@@ -1,5 +1,15 @@
 2013-12-19  Juri Linkov  <address@hidden>
 
+       * 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  <address@hidden>
+
        * vc/log-edit.el (log-edit-insert-filenames-without-changelog):
        New function.
        (log-edit-hook): Add it to :options.  (Bug#16170)

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-12-19 04:48:52 +0000
+++ b/lisp/gnus/ChangeLog       2013-12-19 22:12:12 +0000
@@ -1,3 +1,13 @@
+2013-12-19  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-uu.el (gnus-uu-decode-binhex, gnus-uu-decode-binhex-view):

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2013-11-27 06:39:37 +0000
+++ b/lisp/gnus/gnus-art.el     2013-12-19 22:12:12 +0000
@@ -4395,7 +4395,6 @@
   [?\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

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2013-10-30 06:34:26 +0000
+++ b/lisp/gnus/gnus-group.el   2013-12-19 22:12:12 +0000
@@ -571,7 +571,6 @@
   "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

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2013-09-17 17:22:32 +0000
+++ b/lisp/gnus/gnus-sum.el     2013-12-19 22:12:12 +0000
@@ -1850,7 +1850,6 @@
   [?\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 @@
   "\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

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2013-08-13 07:18:50 +0000
+++ b/lisp/gnus/gnus.el 2013-12-19 22:12:12 +0000
@@ -3035,7 +3035,7 @@
 
 (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))))
 

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2013-10-23 03:35:49 +0000
+++ b/lisp/gnus/mm-decode.el    2013-12-19 22:12:12 +0000
@@ -538,14 +538,6 @@
     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)

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2013-12-19 00:29:41 +0000
+++ b/lisp/isearch.el   2013-12-19 22:12:12 +0000
@@ -500,6 +500,11 @@
     (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 @@
   (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 @@
      (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.

=== modified file 'lisp/isearchb.el'
--- a/lisp/isearchb.el  2013-01-01 09:11:05 +0000
+++ b/lisp/isearchb.el  2013-12-19 22:12:12 +0000
@@ -139,7 +139,8 @@
   (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))))