Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 285-296)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * gnus--rel--5.10  (patch 102-104)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64

1 files changed, 5 insertions, 6 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index f1a68fd8509..33138ef3875 100644
--- 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)))