(ediff-files, ediff-files3, ediff-merge-files)

[gnu-emacs] / lisp / isearch.el

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 8649ba520feb347b1875e7c11baf43abdbf823f3..69ffcdd55f684f38deec95078da16aba1ac74aa3 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -830,21 +830,22 @@ NOPUSH is t and EDIT is t."
 
 (defun isearch-update-ring (string &optional regexp)
   "Add STRING to the beginning of the search ring.
-REGEXP says which ring to use."
+REGEXP if non-nil says use the regexp search ring."
   (if regexp
-      (if (or (null regexp-search-ring)
-             (not (string= string (car regexp-search-ring))))
-         (progn
-           (push string regexp-search-ring)
-           (if (> (length regexp-search-ring) regexp-search-ring-max)
-               (setcdr (nthcdr (1- search-ring-max) regexp-search-ring)
-                       nil))))
-    (if (or (null search-ring)
-           (not (string= string (car search-ring))))
-       (progn
-         (push string search-ring)
-         (if (> (length search-ring) search-ring-max)
-             (setcdr (nthcdr (1- search-ring-max) search-ring) nil))))))
+      (when (or (null regexp-search-ring)
+               (not (string= string (car regexp-search-ring))))
+       (when history-delete-duplicates
+         (setq regexp-search-ring (delete string regexp-search-ring)))
+       (push string regexp-search-ring)
+       (when (> (length regexp-search-ring) regexp-search-ring-max)
+         (setcdr (nthcdr (1- search-ring-max) regexp-search-ring) nil)))
+    (when (or (null search-ring)
+             (not (string= string (car search-ring))))
+      (when history-delete-duplicates
+       (setq search-ring (delete string search-ring)))
+      (push string search-ring)
+      (when (> (length search-ring) search-ring-max)
+       (setcdr (nthcdr (1- search-ring-max) search-ring) nil)))))
 
 ;; Switching buffers should first terminate isearch-mode.
 ;; ;; For Emacs 19, the frame switch event is handled.
@@ -1696,12 +1697,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))