diff options
author | Richard M. Stallman <rms@gnu.org> | 2002-04-10 14:47:27 +0000 |
---|---|---|
committer | Richard M. Stallman <rms@gnu.org> | 2002-04-10 14:47:27 +0000 |
commit | 360e0dd587bd834889a6129da782bcd170e6a8e9 (patch) | |
tree | 27c67ab4f17be9f5e512488b20847fde7c2beed8 /lisp/isearch.el | |
parent | 992f7c96aabb635381b37cb929331cd3e12f2601 (diff) | |
download | emacs-360e0dd587bd834889a6129da782bcd170e6a8e9.tar.gz |
(isearch-mode): Don't call make-frame-visible
if frame is already visible.
Diffstat (limited to 'lisp/isearch.el')
-rw-r--r-- | lisp/isearch.el | 14 |
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." ;; 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" "") |