(normal-top-level): Check for frame-initial-frame

only if it's really used.

diff --git a/lisp/startup.el b/lisp/startup.el
index 294c49e44be6089e13bd7ba78889300f8b23db99..98240fa1b83d28a262097a0b02a6eb28329b3312 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -480,7 +480,11 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 
        ;; 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)