(M-x): Fix.

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index a9a79e63be4b41e08e22b0357cf062195be96b2d..d41c812565f87adc142c7e716f582b1470481247 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -644,18 +644,17 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 
   ;; Convert preloaded file names to absolute.
   (let ((lisp-dir
-        (file-name-directory
-         (locate-file "simple" load-path
-                      (get-load-suffixes)))))
+        (file-truename
+         (file-name-directory
+          (locate-file "simple" load-path
+                       (get-load-suffixes))))))
 
     (setq load-history
          (mapcar (lambda (elt)
                    (if (and (stringp (car elt))
                             (not (file-name-absolute-p (car elt))))
                        (cons (concat lisp-dir
-                                     (car elt)
-                                     (if (string-match "[.]el$" (car elt))
-                                         "" ".elc"))
+                                     (car elt))
                              (cdr elt))
                      elt))
                  load-history)))
@@ -1307,7 +1306,9 @@ where FACE is a valid face specification, as it can be used with
     (set-buffer buffer)
     (erase-buffer)
     (if pure-space-overflow
-       (insert "Warning Warning  Pure space overflow   Warning Warning\n"))
+       (insert "\
+Warning Warning!!!  Pure space overflow    !!!Warning Warning
+\(See the node Pure Storage in the Lisp manual for details.)\n"))
     (fancy-splash-head)
     (apply #'fancy-splash-insert text)
     (fancy-splash-tail)
@@ -1364,7 +1365,7 @@ mouse."
                    emulation-mode-map-alists nil
                    buffer-undo-list t
                    mode-line-format (propertize "---- %b %-"
-                                                'face '(:weight bold))
+                                                'face 'mode-line-buffer-id)
                    fancy-splash-stop-time (+ (float-time)
                                              fancy-splash-max-time)
                    timer (run-with-timer 0 fancy-splash-delay
@@ -1413,10 +1414,12 @@ we put it on this frame."
        (with-current-buffer (get-buffer-create "GNU Emacs")
          (set (make-local-variable 'tab-width) 8)
           (set (make-local-variable 'mode-line-format)
-               (propertize "---- %b %-" 'face '(:weight bold)))
+               (propertize "---- %b %-" 'face 'mode-line-buffer-id))
 
           (if pure-space-overflow
-              (insert "Warning Warning  Pure space overflow   Warning Warning\n"))
+              (insert "\
+Warning Warning!!!  Pure space overflow    !!!Warning Warning
+\(See the node Pure Storage in the Lisp manual for details.)\n"))
 
           ;; The convention for this piece of code is that
           ;; each piece of output starts with one or two newlines
@@ -1629,9 +1632,7 @@ normal otherwise."
             (not noninteractive))
     (display-warning
      'initialization
-     "Building Emacs overflowed pure space.  See \"(elisp)Building Emacs\" for more information."
-     ;; FIXME: Tell the user what kind of problems are possible and how to fix
-     ;; the overflow.
+     "Building Emacs overflowed pure space.  (See the node Pure Storage in the Lisp manual for details.)"
      :warning))
 
   (when command-line-args-left