emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/startup.el,v


From: Eli Zaretskii
Subject: [Emacs-diffs] Changes to emacs/lisp/startup.el,v
Date: Sat, 24 Feb 2007 13:57:40 +0000

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    07/02/24 13:57:39

Index: startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -b -r1.427 -r1.428
--- startup.el  23 Feb 2007 16:26:28 -0000      1.427
+++ startup.el  24 Feb 2007 13:57:39 -0000      1.428
@@ -645,13 +645,17 @@
 
   (set-locale-environment nil)
 
-  ;; Convert preloaded file names to absolute.
-  (let ((lisp-dir
-        (file-truename
-         (file-name-directory
-          (locate-file "simple" load-path
-                       (get-load-suffixes))))))
-
+  ;; Convert preloaded file names in load-history to absolute.
+  (let ((simple-file-name
+        (locate-file "simple" load-path (get-load-suffixes)))
+       lisp-dir)
+    ;; Don't abort if simple.el cannot be found, but print a warning.
+    (if (null simple-file-name)
+       (progn
+         (princ "Warning: Could not find simple.el nor simple.elc"
+                'external-debugging-output)
+         (terpri 'external-debugging-output))
+      (setq lisp-dir (file-truename (file-name-directory simple-file-name)))
     (setq load-history
          (mapcar (lambda (elt)
                    (if (and (stringp (car elt))
@@ -660,7 +664,7 @@
                                      (car elt))
                              (cdr elt))
                      elt))
-                 load-history)))
+                   load-history))))
 
   ;; Convert the arguments to Emacs internal representation.
   (let ((args (cdr command-line-args)))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]