* frame.el (frame-notice-user-settings): Don't make

	frame-initial-frame unbound; just set it to nil.
	* startup.el (command-line-1): Call frame-notice-user-settings
	before displaying the startup message.

diff --git a/lisp/frame.el b/lisp/frame.el
index 87d7efd17a26de477fa6e51c444724aad8b611a1..93971344a5ac8413da4f073f9e65fb4f6d4d6e4f 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -211,7 +211,8 @@ These supercede the values given in `default-frame-alist'.")
     (set-buffer old-buffer)
 
     ;; Make sure the initial frame can be GC'd if it is ever deleted.
-    (makunbound 'frame-initial-frame)))
+    ;; Make sure frame-notice-user-settings does nothing if called twice.
+    (setq frame-initial-frame nil)))
 
 \f
 ;;;; Creation of additional frames, and other frame miscellanea