From 77e5aef9ad757adbb7e4a64156cdab82a036059d Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 5 May 2006 23:37:31 +0000 Subject: [PATCH] * isearch.el (isearch-update-ring): Use add-to-history. --- lisp/isearch.el | 19 ++++--------------- 1 file 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. -- 2.39.2