diff options
Diffstat (limited to 'lisp/isearch.el')
| -rw-r--r-- | lisp/isearch.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index e13d9673514..1e6ac9c024e 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1058,6 +1058,7 @@ nonincremental search instead via `isearch-edit-string'." (isearch-done) (isearch-clean-overlays)) +(defvar minibuffer-history-symbol) ;; from external package gmhist.el (defun isearch-edit-string () "Edit the search string in the minibuffer. @@ -1077,7 +1078,7 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst ;; this could be simplified greatly. ;; Editing doesn't back up the search point. Should it? (interactive) - (condition-case err + (condition-case nil (progn (let ((isearch-nonincremental isearch-nonincremental) @@ -1122,7 +1123,7 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst ;; Actually terminate isearching until editing is done. ;; This is so that the user can do anything without failure, ;; like switch buffers and start another isearch, and return. - (condition-case err + (condition-case nil (isearch-done t t) (exit nil)) ; was recursive editing @@ -2151,7 +2152,7 @@ If there is no completion possible, say so and continue searching." (isearch-message-suffix c-q-hack ellipsis))) (if c-q-hack m (let ((message-log-max nil)) (message "%s" m))))) -(defun isearch-message-prefix (&optional c-q-hack ellipsis nonincremental) +(defun isearch-message-prefix (&optional _c-q-hack ellipsis nonincremental) ;; If about to search, and previous search regexp was invalid, ;; check that it still is. If it is valid now, ;; let the message we display while searching say that it is valid. @@ -2184,7 +2185,7 @@ If there is no completion possible, say so and continue searching." (propertize (concat (upcase (substring m 0 1)) (substring m 1)) 'face 'minibuffer-prompt))) -(defun isearch-message-suffix (&optional c-q-hack ellipsis) +(defun isearch-message-suffix (&optional c-q-hack _ellipsis) (concat (if c-q-hack "^Q" "") (if isearch-error (concat " [" isearch-error "]") |