(isearch-mode): Don't call make-frame-visible

if frame is already visible.

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7d2a4540c64c7027a19af6662c3b22beed36588d..050cccbd8756772b9d33b92c25419a1b9c68002a 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -585,11 +585,11 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
 
   ;; 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 @@ If there is no completion possible, say so and continue searching."
                       (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" "")