From 5719a99df53e4438deb1d086189fb43c9cd65217 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Wed, 3 May 2006 21:36:20 +0000 Subject: [PATCH] (isearch-update-ring): Take history-delete-duplicates into consideration. Replace one arm ifs with whens. --- lisp/ChangeLog | 5 +++++ lisp/isearch.el | 27 ++++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2a402f88c01..52bf5a0a686 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-05-03 Dan Nicolaescu + + * isearch.el (isearch-update-ring): Take history-delete-duplicates + into consideration. Replace one arm ifs with whens. + 2006-05-03 Nick Roberts * progmodes/gdb-ui.el (gud-watch): Let user select an expression. diff --git a/lisp/isearch.el b/lisp/isearch.el index 7e491c378ab..e82f47f37e4 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -832,19 +832,20 @@ NOPUSH is t and EDIT is t." "Add STRING to the beginning of the search ring. REGEXP says which ring to use." (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. -- 2.39.5