Mercurial > emacs

changeset 44472:9d117150b0a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(isearch-mode): Don't call make-frame-visible if frame is already visible.
author Richard M. Stallman <rms@gnu.org>
date Wed, 10 Apr 2002 14:47:27 +0000
parents b1d6fcf67b85
children b64869712ee0
files lisp/isearch.el
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/isearch.el	Wed Apr 10 14:45:37 2002 +0000
+++ b/lisp/isearch.el	Wed Apr 10 14:47:27 2002 +0000
@@ -585,11 +585,11 @@
 
   ;; Maybe make minibuffer frame visible and/or raise it.
   (let ((frame (window-frame (minibuffer-window))))
-    (if (not (memq (frame-live-p frame) '(nil t)))
-	(progn
-	  (make-frame-visible frame)
-	  (if minibuffer-auto-raise
-	      (raise-frame frame)))))
+    (unless (memq (frame-live-p frame) '(nil t))
+      (unless (frame-visible-p frame)
+	(make-frame-visible frame))
+      (if minibuffer-auto-raise
+	  (raise-frame frame))))
 
   (setq	isearch-mode " Isearch")  ;; forward? regexp?
   (force-mode-line-update)
@@ -1600,8 +1600,8 @@
 		       (concat " [" current-input-method-title "]: ")
 		     ": ")
 		   )))
-    (propertize (concat (upcase (substring m 0 1)) (substring m 1)) 'face 'minibuffer-prompt)))
-
+    (propertize (concat (upcase (substring m 0 1)) (substring m 1))
+		'face 'minibuffer-prompt)))
 
 (defun isearch-message-suffix (&optional c-q-hack ellipsis)
   (concat (if c-q-hack "^Q" "")