aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-04-10 14:47:27 +0000
committerRichard M. Stallman2002-04-10 14:47:27 +0000
commit360e0dd587bd834889a6129da782bcd170e6a8e9 (patch)
tree27c67ab4f17be9f5e512488b20847fde7c2beed8
parent992f7c96aabb635381b37cb929331cd3e12f2601 (diff)
downloademacs-360e0dd587bd834889a6129da782bcd170e6a8e9.tar.gz
emacs-360e0dd587bd834889a6129da782bcd170e6a8e9.zip
(isearch-mode): Don't call make-frame-visible
if frame is already visible.
-rw-r--r--lisp/isearch.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7d2a4540c64..050cccbd875 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -585,11 +585,11 @@ is treated as a regexp. See \\[isearch-forward] for more info."
585 585
586 ;; Maybe make minibuffer frame visible and/or raise it. 586 ;; Maybe make minibuffer frame visible and/or raise it.
587 (let ((frame (window-frame (minibuffer-window)))) 587 (let ((frame (window-frame (minibuffer-window))))
588 (if (not (memq (frame-live-p frame) '(nil t))) 588 (unless (memq (frame-live-p frame) '(nil t))
589 (progn 589 (unless (frame-visible-p frame)
590 (make-frame-visible frame) 590 (make-frame-visible frame))
591 (if minibuffer-auto-raise 591 (if minibuffer-auto-raise
592 (raise-frame frame))))) 592 (raise-frame frame))))
593 593
594 (setq isearch-mode " Isearch") ;; forward? regexp? 594 (setq isearch-mode " Isearch") ;; forward? regexp?
595 (force-mode-line-update) 595 (force-mode-line-update)
@@ -1600,8 +1600,8 @@ If there is no completion possible, say so and continue searching."
1600 (concat " [" current-input-method-title "]: ") 1600 (concat " [" current-input-method-title "]: ")
1601 ": ") 1601 ": ")
1602 ))) 1602 )))
1603 (propertize (concat (upcase (substring m 0 1)) (substring m 1)) 'face 'minibuffer-prompt))) 1603 (propertize (concat (upcase (substring m 0 1)) (substring m 1))
1604 1604 'face 'minibuffer-prompt)))
1605 1605
1606(defun isearch-message-suffix (&optional c-q-hack ellipsis) 1606(defun isearch-message-suffix (&optional c-q-hack ellipsis)
1607 (concat (if c-q-hack "^Q" "") 1607 (concat (if c-q-hack "^Q" "")