--- a/lisp/prim/startup.el	Mon Aug 13 09:59:07 2007 +0200
+++ b/lisp/prim/startup.el	Mon Aug 13 10:00:02 2007 +0200
@@ -345,6 +345,9 @@
       (backtrace stream t)))
   (kill-emacs -1))
 
+(defvar lock-directory)
+(defvar superlock-file)
+
 (defun normal-top-level ()
   (if command-line-processed
       (message "Back to top level.")
@@ -496,10 +499,6 @@
       (when (featurep 'toolbar)
 	(init-toolbar-location))
 
-      ;; Initialize the built-in glyphs and default specifier lists
-      (when (not noninteractive)
-	(init-glyphs))
-
       ;; Run the window system's init function.  tty is considered to be
       ;; a type of window system for this purpose.  This creates the
       ;; initial (non stdio) device.
@@ -809,8 +808,7 @@
 
 (defun splash-frame-present (l)
   (cond ((stringp l)
-         (insert l)
-	 (splash-hack-version-string))
+         (insert l))
         ((eq (car-safe l) 'face)
          ;; (face name string)
          (let ((p (point)))
@@ -930,6 +928,7 @@
   (let ((after-change-functions nil))	; no font-lock, thank you
     (dolist (l (startup-splash-frame-body))
       (splash-frame-present l)))
+  (splash-hack-version-string)
   (set-buffer-modified-p nil))
 
 ;;  (let ((present-file