(diff-mode-shared-map): Don't bind M-W, M-U, M-C,

[gnu-emacs] / lisp / isearch.el

diff --git a/lisp/isearch.el b/lisp/isearch.el
index ba700a893eb544b64d314d44e4f94ec5ed5ab924..7e491c378ab21104115282185fbe108c8ebf19d9 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -116,8 +116,11 @@ When you put a space or spaces in the incremental regexp, it stands for
 this, unless it is inside of a regexp construct such as [...] or *, + or ?.
 You might want to use something like \"[ \\t\\r\\n]+\" instead.
 In the Customization buffer, that is `[' followed by a space,
-a tab, a carriage return (control-M), a newline, and `]+'."
-  :type 'regexp
+a tab, a carriage return (control-M), a newline, and `]+'.
+
+When this is nil, each space you type matches literally, against one space."
+  :type '(choice (const :tag "Find Spaces Literally" nil)
+                regexp)
   :group 'isearch)
 
 (defcustom search-invisible 'open
@@ -1693,12 +1696,15 @@ Isearch mode."
             (and (integerp main-event)
                  (memq 'shift mods)
                  (memq 'control mods)
-                 (lookup-key isearch-mode-map
-                             (let ((copy (copy-sequence key)))
-                               (aset copy 0
-                                     (- main-event (- ?\C-\S-a ?\C-a)))
-                               copy)
-                             nil)))
+                 (not (memq (lookup-key isearch-mode-map
+                                        (let ((copy (copy-sequence key)))
+                                          (aset copy 0
+                                                (- main-event
+                                                   (- ?\C-\S-a ?\C-a)))
+                                          copy)
+                                        nil)
+                            '(nil
+                              isearch-other-control-char)))))
           (setcar keylist (- main-event (- ?\C-\S-a ?\C-a)))
           (cancel-kbd-macro-events)
           (apply 'isearch-unread keylist))