From 68251e166138388f243993c83d0ef211fb05c847 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 15 Dec 2010 00:16:53 -0800 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ Makefile.in | 9 --------- lisp/ChangeLog | 4 ++++ lisp/loadup.el | 38 ++++---------------------------------- lisp/subr.el | 20 -------------------- 5 files changed, 13 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bf18e23867..d1982e71d56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-12-15 Glenn Morris + + * Makefile.in (install-arch-dep, uninstall): Remove code relating to the + long absent lib-src/fns-*.el. + 2010-12-11 Glenn Morris * make-dist: Exclude etc/*.pyc. diff --git a/Makefile.in b/Makefile.in index 5466193a7f1..09876d8cffa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -424,12 +424,6 @@ install-arch-dep: mkdir -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 @@ uninstall: 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 \ diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 13a5a358546..3b16df17a13 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-12-15 Glenn Morris + + * loadup.el (symbol-file-load-history-loaded): Remove; unused. + 2010-12-15 Jari Aalto Scott Evans diff --git a/lisp/loadup.el b/lisp/loadup.el index d13e38c0b36..fb3aaff37c1 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -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) diff --git a/lisp/subr.el b/lisp/subr.el index 8a7ef7069c2..8a8e4410ce6 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1482,26 +1482,6 @@ If TOGGLE has a `:menu-tag', that is used for the menu item's label." ;;; 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, -- 2.11.4.GIT