Mercurial > emacs
changeset 111971:ca22802893d9
Remove code and comments related to lib-src/fns-*.el; long removed.
* Makefile.in (install-arch-dep, uninstall): Remove code relating to the
long absent lib-src/fns-*.el.
* lisp/loadup.el (symbol-file-load-history-loaded): Remove; unused.
Remove related, old, commented-out code.
* lisp/subr.el (symbol-file-load-history-loaded)
(load-symbol-file-load-history): Remove old, commented-out code.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 15 Dec 2010 00:16:53 -0800 |
| parents | 9570b2539308 |
| children | 3b8b4f28c758 |
| files | ChangeLog Makefile.in lisp/ChangeLog lisp/loadup.el lisp/subr.el |
| diffstat | 5 files changed, 13 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Dec 15 10:56:22 2010 +0800 +++ b/ChangeLog Wed Dec 15 00:16:53 2010 -0800 @@ -1,3 +1,8 @@ +2010-12-15 Glenn Morris <rgm@gnu.org> + + * Makefile.in (install-arch-dep, uninstall): Remove code relating to the + long absent lib-src/fns-*.el. + 2010-12-11 Glenn Morris <rgm@gnu.org> * make-dist: Exclude etc/*.pyc.
--- a/Makefile.in Wed Dec 15 10:56:22 2010 +0800 +++ b/Makefile.in Wed Dec 15 00:16:53 2010 -0800 @@ -424,12 +424,6 @@ -chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) rm -f $(DESTDIR)${bindir}/$(EMACS) -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) - -unset CDPATH; \ - for f in `cd lib-src && echo fns-*.el`; do \ - if test -r lib-src/$$f ; then \ - ${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \ - else true; fi ; \ - done if test "${ns_appresdir}" != ""; then \ ( cd ${ns_appresdir} ; \ if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ @@ -682,9 +676,6 @@ esac ; \ fi ; \ done - if [ -d $(DESTDIR)${archlibdir} ]; then \ - (cd $(DESTDIR)${archlibdir} && rm -f fns-*) \ - fi -rm -rf $(DESTDIR)${libexecdir}/emacs/${version} (cd $(DESTDIR)${infodir} && \ for elt in $(INFO_FILES); do \
--- a/lisp/ChangeLog Wed Dec 15 10:56:22 2010 +0800 +++ b/lisp/ChangeLog Wed Dec 15 00:16:53 2010 -0800 @@ -1,3 +1,7 @@ +2010-12-15 Glenn Morris <rgm@gnu.org> + + * loadup.el (symbol-file-load-history-loaded): Remove; unused. + 2010-12-15 Jari Aalto <jari.aalto@cante.net> Scott Evans <gse@antisleep.com>
--- a/lisp/loadup.el Wed Dec 15 10:56:22 2010 +0800 +++ b/lisp/loadup.el Wed Dec 15 00:16:53 2010 -0800 @@ -292,46 +292,16 @@ (error nil))) (message "Finding pointers to doc strings...done") -;;;Note: You can cause additional libraries to be preloaded -;;;by writing a site-init.el that loads them. -;;;See also "site-load" above. +;; Note: You can cause additional libraries to be preloaded +;; by writing a site-init.el that loads them. +;; See also "site-load" above. (load "site-init" t) (setq current-load-list nil) -;; Write the value of load-history into fns-VERSION.el, -;; then clear out load-history. -;; (if (or (equal (nth 3 command-line-args) "dump") -;; (equal (nth 4 command-line-args) "dump")) -;; (let ((buffer-undo-list t)) -;; (princ "(setq load-history\n" (current-buffer)) -;; (princ " (nconc load-history\n" (current-buffer)) -;; (princ " '(" (current-buffer)) -;; (let ((tem load-history)) -;; (while tem -;; (prin1 (car tem) (current-buffer)) -;; (terpri (current-buffer)) -;; (if (cdr tem) -;; (princ " " (current-buffer))) -;; (setq tem (cdr tem)))) -;; (princ ")))\n" (current-buffer)) -;; (write-region (point-min) (point-max) -;; (expand-file-name -;; (cond -;; ((eq system-type 'ms-dos) -;; "../lib-src/fns.el") -;; ((eq system-type 'windows-nt) -;; (format "../../../lib-src/fns-%s.el" emacs-version)) -;; (t -;; (format "../lib-src/fns-%s.el" emacs-version))) -;; invocation-directory)) -;; (erase-buffer) -;; (setq load-history nil)) -;; (setq symbol-file-load-history-loaded t)) -;; We don't use this fns-*.el file. Instead we keep the data in PURE space. +;; We keep the load-history data in PURE space. ;; Make sure that the spine of the list is not in pure space because it can ;; be destructively mutated in lread.c:build_load_history. (setq load-history (mapcar 'purecopy load-history)) -(setq symbol-file-load-history-loaded t) (set-buffer-modified-p nil)
--- a/lisp/subr.el Wed Dec 15 10:56:22 2010 +0800 +++ b/lisp/subr.el Wed Dec 15 00:16:53 2010 -0800 @@ -1482,26 +1482,6 @@ ;;; Load history -;; (defvar symbol-file-load-history-loaded nil -;; "Non-nil means we have loaded the file `fns-VERSION.el' in `exec-directory'. -;; That file records the part of `load-history' for preloaded files, -;; which is cleared out before dumping to make Emacs smaller.") - -;; (defun load-symbol-file-load-history () -;; "Load the file `fns-VERSION.el' in `exec-directory' if not already done. -;; That file records the part of `load-history' for preloaded files, -;; which is cleared out before dumping to make Emacs smaller." -;; (unless symbol-file-load-history-loaded -;; (load (expand-file-name -;; ;; fns-XX.YY.ZZ.el does not work on DOS filesystem. -;; (if (eq system-type 'ms-dos) -;; "fns.el" -;; (format "fns-%s.el" emacs-version)) -;; exec-directory) -;; ;; The file name fns-%s.el already has a .el extension. -;; nil nil t) -;; (setq symbol-file-load-history-loaded t))) - (defun symbol-file (symbol &optional type) "Return the name of the file that defined SYMBOL. The value is normally an absolute file name. It can also be nil,