Mercurial > emacs
changeset 40304:ccd5c473ddcf
(normal-top-level): Check for frame-initial-frame
only if it's really used.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 25 Oct 2001 13:32:29 +0000 |
| parents | a725c601ef70 |
| children | 1527284286a6 |
| files | lisp/startup.el |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Thu Oct 25 12:58:15 2001 +0000 +++ b/lisp/startup.el Thu Oct 25 13:32:29 2001 +0000 @@ -485,7 +485,11 @@ ;; Don't do this if we failed to create the initial frame, ;; for instance due to a dense colormap. - (when frame-initial-frame + (when (or frame-initial-frame + ;; If frame-initial-frame has no meaning, do this anyway. + (not (and window-system + (not noninteractive) + (not (eq window-system 'pc))))) ;; Modify the initial frame based on what .emacs puts into ;; ...-frame-alist. (if (fboundp 'frame-notice-user-settings)