Commit 6a1e7d67 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(normal-top-level): Don't operate on the initial

frame if we failed to create one.
parent 30a7ac22
......@@ -470,6 +470,10 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(run-hooks 'emacs-startup-hook)
(and term-setup-hook
(run-hooks 'term-setup-hook))
;; Don't do this if we failed to create the initial frame,
;; for instance due to a dense colormap.
(when frame-initial-frame
;; Modify the initial frame based on what .emacs puts into
;; ...-frame-alist.
(if (fboundp 'frame-notice-user-settings)
......@@ -494,7 +498,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(if (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)"
term)
(setq frame-background-mode 'light)))
(frame-set-background-mode (selected-frame))))
(frame-set-background-mode (selected-frame)))))
;; Now we know the user's default font, so add it to the menu.
(if (fboundp 'font-menu-add-default)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment