aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-08-24 02:58:53 +0000
committerRichard M. Stallman2002-08-24 02:58:53 +0000
commita2c4ae01567bac62988eab57b4043eff21255819 (patch)
treedc3fd40d05afda606c8dff24cf506bec50f9d7d4
parent1aa8fe46657651c18db8fafb31ef3cbf4bf3accf (diff)
downloademacs-a2c4ae01567bac62988eab57b4043eff21255819.tar.gz
emacs-a2c4ae01567bac62988eab57b4043eff21255819.zip
(symbol-file-load-history-loaded)
(load-symbol-file-load-history): Deleted. (symbol-file): Don't call load-symbol-file-load-history.
-rw-r--r--lisp/subr.el40
1 files changed, 20 insertions, 20 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index 15d483c10b6..d1e82e30d18 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -892,25 +892,25 @@ other hooks, such as major mode hooks, can do the job."
892 892
893;;; Load history 893;;; Load history
894 894
895(defvar symbol-file-load-history-loaded nil 895;;; (defvar symbol-file-load-history-loaded nil
896 "Non-nil means we have loaded the file `fns-VERSION.el' in `exec-directory'. 896;;; "Non-nil means we have loaded the file `fns-VERSION.el' in `exec-directory'.
897That file records the part of `load-history' for preloaded files, 897;;; That file records the part of `load-history' for preloaded files,
898which is cleared out before dumping to make Emacs smaller.") 898;;; which is cleared out before dumping to make Emacs smaller.")
899 899
900(defun load-symbol-file-load-history () 900;;; (defun load-symbol-file-load-history ()
901 "Load the file `fns-VERSION.el' in `exec-directory' if not already done. 901;;; "Load the file `fns-VERSION.el' in `exec-directory' if not already done.
902That file records the part of `load-history' for preloaded files, 902;;; That file records the part of `load-history' for preloaded files,
903which is cleared out before dumping to make Emacs smaller." 903;;; which is cleared out before dumping to make Emacs smaller."
904 (unless symbol-file-load-history-loaded 904;;; (unless symbol-file-load-history-loaded
905 (load (expand-file-name 905;;; (load (expand-file-name
906 ;; fns-XX.YY.ZZ.el does not work on DOS filesystem. 906;;; ;; fns-XX.YY.ZZ.el does not work on DOS filesystem.
907 (if (eq system-type 'ms-dos) 907;;; (if (eq system-type 'ms-dos)
908 "fns.el" 908;;; "fns.el"
909 (format "fns-%s.el" emacs-version)) 909;;; (format "fns-%s.el" emacs-version))
910 exec-directory) 910;;; exec-directory)
911 ;; The file name fns-%s.el already has a .el extension. 911;;; ;; The file name fns-%s.el already has a .el extension.
912 nil nil t) 912;;; nil nil t)
913 (setq symbol-file-load-history-loaded t))) 913;;; (setq symbol-file-load-history-loaded t)))
914 914
915(defun symbol-file (function) 915(defun symbol-file (function)
916 "Return the input source from which FUNCTION was loaded. 916 "Return the input source from which FUNCTION was loaded.
@@ -918,7 +918,7 @@ The value is normally a string that was passed to `load':
918either an absolute file name, or a library name 918either an absolute file name, or a library name
919\(with no directory name and no `.el' or `.elc' at the end). 919\(with no directory name and no `.el' or `.elc' at the end).
920It can also be nil, if the definition is not associated with any file." 920It can also be nil, if the definition is not associated with any file."
921 (load-symbol-file-load-history) 921;;; (load-symbol-file-load-history)
922 (let ((files load-history) 922 (let ((files load-history)
923 file functions) 923 file functions)
924 (while files 924 (while files