Mercurial > emacs
comparison lisp/frame.el @ 15399:e9ec008793fd
(frame-initialize): Don't count MSDOS neither as
window-system nor as a terminal frame here.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 10 Jun 1996 21:20:40 +0000 |
parents | a4e1db62f693 |
children | 182b9268dbad |
comparison
equal
deleted
inserted
replaced
15398:e0d50fe661c0 | 15399:e9ec008793fd |
---|---|
150 ;;; file - if there is no frame with a minibuffer open now, create | 150 ;;; file - if there is no frame with a minibuffer open now, create |
151 ;;; one to display messages while loading the init file. | 151 ;;; one to display messages while loading the init file. |
152 (defun frame-initialize () | 152 (defun frame-initialize () |
153 | 153 |
154 ;; Are we actually running under a window system at all? | 154 ;; Are we actually running under a window system at all? |
155 (if (and window-system (not noninteractive)) | 155 (if (and window-system (not noninteractive) (not (eq window-system 'pc))) |
156 (progn | 156 (progn |
157 ;; Turn on special-display processing only if there's a window system. | 157 ;; Turn on special-display processing only if there's a window system. |
158 (setq special-display-function 'special-display-popup-frame) | 158 (setq special-display-function 'special-display-popup-frame) |
159 | 159 |
160 ;; If there is no frame with a minibuffer besides the terminal | 160 ;; If there is no frame with a minibuffer besides the terminal |
189 (delete-frame terminal-frame) | 189 (delete-frame terminal-frame) |
190 (setq terminal-frame nil)) | 190 (setq terminal-frame nil)) |
191 | 191 |
192 ;; No, we're not running a window system. Use make-terminal-frame if | 192 ;; No, we're not running a window system. Use make-terminal-frame if |
193 ;; we support that feature, otherwise arrange to cause errors. | 193 ;; we support that feature, otherwise arrange to cause errors. |
194 (setq frame-creation-function | 194 (or (eq window-system 'pc) |
195 (if (fboundp 'make-terminal-frame) | 195 (setq frame-creation-function |
196 'make-terminal-frame | 196 (if (fboundp 'make-terminal-frame) |
197 (function | 197 'make-terminal-frame |
198 (lambda (parameters) | 198 (function |
199 (error | 199 (lambda (parameters) |
200 "Can't create multiple frames without a window system"))))))) | 200 (error |
201 "Can't create multiple frames without a window system")))))))) | |
201 | 202 |
202 ;;; startup.el calls this function after loading the user's init | 203 ;;; startup.el calls this function after loading the user's init |
203 ;;; file. Now default-frame-alist and initial-frame-alist contain | 204 ;;; file. Now default-frame-alist and initial-frame-alist contain |
204 ;;; information to which we must react; do what needs to be done. | 205 ;;; information to which we must react; do what needs to be done. |
205 (defun frame-notice-user-settings () | 206 (defun frame-notice-user-settings () |