(load-history-loaded): New variable.

(symbol-file): Load etc/fns-VERSION.el if that has not been done.

diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 1c727688ce71bf7ec94f30acabfb9d4ae2aa85fb..5cebf2d63c4d0800439c879eed0084c10ca6a7eb 100644 (file)
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -31,9 +31,18 @@
 
 ;;; Code:
 
+(defvar load-history-loaded nil
+  "Non-nil means we have loaded the file `etc/fns-VERSION.el'.
+That file records the part of `load-history' for preloaded files,
+which is cleared out before dumping to make Emacs smaller.")
+
 (defun symbol-file (sym)
   "Return the input source from which SYM was loaded.
 This is a file name, or nil if the source was a buffer with no associated file."
+  (unless load-history-loaded
+    (load (expand-file-name (format "fns-%s.el" emacs-version)
+                           data-directory))
+    (setq load-history-loaded t))
   (catch 'foundit
     (mapcar
      (function (lambda (x) (if (memq sym (cdr x)) (throw 'foundit (car x)))))