Mercurial > emacs

changeset 33725:687b166e4a49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(isearch-original-minibuffer-message-timeout): New var. (isearch-mode): Set `minibuffer-message-timeout' to nil, after stashing away its original value. (isearch-edit-string): Temporarily restore `minibuffer-message-timeout' in the recursive edit. Bind `isearch-original-minibuffer-message-timeout' to protect it. (isearch-done): Restore `minibuffer-message-timeout'.
author Miles Bader <miles@gnu.org>
date Wed, 22 Nov 2000 01:35:32 +0000
parents b04964da2e33
children ab07e9c19c57
files lisp/isearch.el
diffstat 1 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/isearch.el	Wed Nov 22 01:34:53 2000 +0000
+++ b/lisp/isearch.el	Wed Nov 22 01:35:32 2000 +0000
@@ -365,6 +365,9 @@
 ;   case in the search string is ignored.
 (defvar isearch-case-fold-search nil)
 
+;; Used to save default value while isearch is active
+(defvar isearch-original-minibuffer-message-timeout nil)
+
 (defvar isearch-adjusted nil)
 (defvar isearch-slow-terminal-mode nil)
 ;;; If t, using a small window.
@@ -536,7 +539,12 @@
 	isearch-opened-overlays nil
 	isearch-input-method-function input-method-function
 	isearch-input-method-local-p (local-variable-p 'input-method-function)
-	regexp-search-ring-yank-pointer nil)
+	regexp-search-ring-yank-pointer nil
+
+	;; Save the original value of `minibuffer-message-timeout', and
+	;; set it to nil so that isearch's messages don't get timed out.
+	isearch-original-minibuffer-message-timeout minibuffer-message-timeout
+	minibuffer-message-timeout nil)
 
   ;; We must bypass input method while reading key.  When a user type
   ;; printable character, appropriate input method is turned on in
@@ -631,6 +639,7 @@
   ;; If NOPUSH is non-nil, we don't push the string on the search ring.
   (setq overriding-terminal-local-map nil)
   ;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs
+  (setq minibuffer-message-timeout isearch-original-minibuffer-message-timeout)
   (isearch-dehighlight t)
   (isearch-lazy-highlight-cleanup)
   (let ((found-start (window-start (selected-window)))
@@ -777,6 +786,12 @@
 	      (isearch-recursive-edit isearch-recursive-edit)
 	      ;; Save current configuration so we can restore it here.
 	      (isearch-window-configuration (current-window-configuration))
+
+	      ;; Temporarily restore `minibuffer-message-timeout'.
+	      (minibuffer-message-timeout
+	       isearch-original-minibuffer-message-timeout)
+	      (isearch-original-minibuffer-message-timeout
+	       isearch-original-minibuffer-message-timeout)
 	      )
 
 	  ;; Actually terminate isearching until editing is done.