summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-10-28 18:47:40 +0000
committerRichard M. Stallman <rms@gnu.org>1994-10-28 18:47:40 +0000
commit4af6bd8cecbee285ac3eff9a792b9b5500cea5d2 (patch)
treefd89f89476c9836183bff120c42e6c20d19b2785 /lisp
parent9a1e6a98102e544b6fbdb82526ad88b020837f7f (diff)
downloademacs-4af6bd8cecbee285ac3eff9a792b9b5500cea5d2.tar.gz
(frame-initialize): Set special-display-function here,
not at top level.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/frame.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 577771c5901..b3c599aae77 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -104,8 +104,6 @@ These supersede the values given in `default-frame-alist'.")
(set-window-dedicated-p (frame-selected-window frame) t)
(frame-selected-window frame))))))
-(setq special-display-function 'special-display-popup-frame)
-
;; Handle delete-frame events from the X server.
(defun handle-delete-frame (event)
(interactive "e")
@@ -150,10 +148,13 @@ These supersede the values given in `default-frame-alist'.")
;;; file - if there is no frame with a minibuffer open now, create
;;; one to display messages while loading the init file.
(defun frame-initialize ()
-
+
;; Are we actually running under a window system at all?
(if (and window-system (not noninteractive))
(progn
+ ;; Turn on special-display processing only if there's a window system.
+ (setq special-display-function 'special-display-popup-frame)
+
;; If there is no frame with a minibuffer besides the terminal
;; frame, then we need to create the opening frame. Make sure
;; it has a minibuffer, but let initial-frame-alist omit the