From: Kim F. Storm <storm@cua.dk>
Date: Fri, 5 May 2006 23:37:31 +0000 (+0000)
Subject: * isearch.el (isearch-update-ring): Use add-to-history.
X-Git-Tag: emacs-pretest-22.0.90~2779
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=77e5aef9ad757adbb7e4a64156cdab82a036059d;p=emacs.git

* isearch.el (isearch-update-ring): Use add-to-history.
---

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 69ffcdd55f6..014c8efe188 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -831,21 +831,10 @@ NOPUSH is t and EDIT is t."
 (defun isearch-update-ring (string &optional regexp)
   "Add STRING to the beginning of the search ring.
 REGEXP if non-nil says use the regexp search ring."
-  (if regexp
-      (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)))))
+  (add-to-history
+   (if regexp 'regexp-search-ring 'search-ring)
+   string
+   (if regexp regexp-search-ring-max search-ring-max)))
 
 ;; Switching buffers should first terminate isearch-mode.
 ;; ;; For Emacs 19, the frame switch event is handled.