summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim F. Storm <storm@cua.dk>2006-05-05 23:37:31 +0000
committerKim F. Storm <storm@cua.dk>2006-05-05 23:37:31 +0000
commit77e5aef9ad757adbb7e4a64156cdab82a036059d (patch)
tree55c544354bb55ad3bb7e8ed5fe79a9c87e8ef96c
parent4c5f6185280e155c418568bc6b9844059aa5f992 (diff)
downloademacs-77e5aef9ad757adbb7e4a64156cdab82a036059d.tar.gz
* isearch.el (isearch-update-ring): Use add-to-history.
-rw-r--r--lisp/isearch.el19
1 files changed, 4 insertions, 15 deletions
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.