* 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.

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)))
 
 
 ;;;; Creation of additional frames, and other frame miscellanea