Mercurial > emacs
changeset 70418:4e1a43edc7bc
* isearch.el (isearch-update-ring): Use add-to-history.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Fri, 05 May 2006 23:37:31 +0000 |
| parents | 95f3ef491663 |
| children | c18be7440465 |
| files | lisp/isearch.el |
| diffstat | 1 files changed, 4 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/isearch.el Fri May 05 23:36:55 2006 +0000 +++ b/lisp/isearch.el Fri May 05 23:37:31 2006 +0000 @@ -831,21 +831,10 @@ (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.