diff options
| author | Glenn Morris | 2010-12-15 00:16:53 -0800 |
|---|---|---|
| committer | Glenn Morris | 2010-12-15 00:16:53 -0800 |
| commit | 68251e166138388f243993c83d0ef211fb05c847 (patch) | |
| tree | 652715dcf3e3c65dea7437d80a8062a0328bc173 | |
| parent | 99f053cfb94763b5d31bcf0802e4b9233da2bea4 (diff) | |
| download | emacs-68251e166138388f243993c83d0ef211fb05c847.tar.gz emacs-68251e166138388f243993c83d0ef211fb05c847.zip | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 9 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/loadup.el | 38 | ||||
| -rw-r--r-- | lisp/subr.el | 20 |
5 files changed, 13 insertions, 63 deletions
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-12-15 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (install-arch-dep, uninstall): Remove code relating to the | ||
| 4 | long absent lib-src/fns-*.el. | ||
| 5 | |||
| 1 | 2010-12-11 Glenn Morris <rgm@gnu.org> | 6 | 2010-12-11 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * make-dist: Exclude etc/*.pyc. | 8 | * 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 | |||
| 424 | -chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) | 424 | -chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) |
| 425 | rm -f $(DESTDIR)${bindir}/$(EMACS) | 425 | rm -f $(DESTDIR)${bindir}/$(EMACS) |
| 426 | -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) | 426 | -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) |
| 427 | -unset CDPATH; \ | ||
| 428 | for f in `cd lib-src && echo fns-*.el`; do \ | ||
| 429 | if test -r lib-src/$$f ; then \ | ||
| 430 | ${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \ | ||
| 431 | else true; fi ; \ | ||
| 432 | done | ||
| 433 | if test "${ns_appresdir}" != ""; then \ | 427 | if test "${ns_appresdir}" != ""; then \ |
| 434 | ( cd ${ns_appresdir} ; \ | 428 | ( cd ${ns_appresdir} ; \ |
| 435 | if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ | 429 | if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ |
| @@ -682,9 +676,6 @@ uninstall: | |||
| 682 | esac ; \ | 676 | esac ; \ |
| 683 | fi ; \ | 677 | fi ; \ |
| 684 | done | 678 | done |
| 685 | if [ -d $(DESTDIR)${archlibdir} ]; then \ | ||
| 686 | (cd $(DESTDIR)${archlibdir} && rm -f fns-*) \ | ||
| 687 | fi | ||
| 688 | -rm -rf $(DESTDIR)${libexecdir}/emacs/${version} | 679 | -rm -rf $(DESTDIR)${libexecdir}/emacs/${version} |
| 689 | (cd $(DESTDIR)${infodir} && \ | 680 | (cd $(DESTDIR)${infodir} && \ |
| 690 | for elt in $(INFO_FILES); do \ | 681 | 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 @@ | |||
| 1 | 2010-12-15 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * loadup.el (symbol-file-load-history-loaded): Remove; unused. | ||
| 4 | |||
| 1 | 2010-12-15 Jari Aalto <jari.aalto@cante.net> | 5 | 2010-12-15 Jari Aalto <jari.aalto@cante.net> |
| 2 | Scott Evans <gse@antisleep.com> | 6 | Scott Evans <gse@antisleep.com> |
| 3 | 7 | ||
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 @@ | |||
| 292 | (error nil))) | 292 | (error nil))) |
| 293 | (message "Finding pointers to doc strings...done") | 293 | (message "Finding pointers to doc strings...done") |
| 294 | 294 | ||
| 295 | ;;;Note: You can cause additional libraries to be preloaded | 295 | ;; Note: You can cause additional libraries to be preloaded |
| 296 | ;;;by writing a site-init.el that loads them. | 296 | ;; by writing a site-init.el that loads them. |
| 297 | ;;;See also "site-load" above. | 297 | ;; See also "site-load" above. |
| 298 | (load "site-init" t) | 298 | (load "site-init" t) |
| 299 | (setq current-load-list nil) | 299 | (setq current-load-list nil) |
| 300 | 300 | ||
| 301 | ;; Write the value of load-history into fns-VERSION.el, | 301 | ;; We keep the load-history data in PURE space. |
| 302 | ;; then clear out load-history. | ||
| 303 | ;; (if (or (equal (nth 3 command-line-args) "dump") | ||
| 304 | ;; (equal (nth 4 command-line-args) "dump")) | ||
| 305 | ;; (let ((buffer-undo-list t)) | ||
| 306 | ;; (princ "(setq load-history\n" (current-buffer)) | ||
| 307 | ;; (princ " (nconc load-history\n" (current-buffer)) | ||
| 308 | ;; (princ " '(" (current-buffer)) | ||
| 309 | ;; (let ((tem load-history)) | ||
| 310 | ;; (while tem | ||
| 311 | ;; (prin1 (car tem) (current-buffer)) | ||
| 312 | ;; (terpri (current-buffer)) | ||
| 313 | ;; (if (cdr tem) | ||
| 314 | ;; (princ " " (current-buffer))) | ||
| 315 | ;; (setq tem (cdr tem)))) | ||
| 316 | ;; (princ ")))\n" (current-buffer)) | ||
| 317 | ;; (write-region (point-min) (point-max) | ||
| 318 | ;; (expand-file-name | ||
| 319 | ;; (cond | ||
| 320 | ;; ((eq system-type 'ms-dos) | ||
| 321 | ;; "../lib-src/fns.el") | ||
| 322 | ;; ((eq system-type 'windows-nt) | ||
| 323 | ;; (format "../../../lib-src/fns-%s.el" emacs-version)) | ||
| 324 | ;; (t | ||
| 325 | ;; (format "../lib-src/fns-%s.el" emacs-version))) | ||
| 326 | ;; invocation-directory)) | ||
| 327 | ;; (erase-buffer) | ||
| 328 | ;; (setq load-history nil)) | ||
| 329 | ;; (setq symbol-file-load-history-loaded t)) | ||
| 330 | ;; We don't use this fns-*.el file. Instead we keep the data in PURE space. | ||
| 331 | ;; Make sure that the spine of the list is not in pure space because it can | 302 | ;; Make sure that the spine of the list is not in pure space because it can |
| 332 | ;; be destructively mutated in lread.c:build_load_history. | 303 | ;; be destructively mutated in lread.c:build_load_history. |
| 333 | (setq load-history (mapcar 'purecopy load-history)) | 304 | (setq load-history (mapcar 'purecopy load-history)) |
| 334 | (setq symbol-file-load-history-loaded t) | ||
| 335 | 305 | ||
| 336 | (set-buffer-modified-p nil) | 306 | (set-buffer-modified-p nil) |
| 337 | 307 | ||
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." | |||
| 1482 | 1482 | ||
| 1483 | ;;; Load history | 1483 | ;;; Load history |
| 1484 | 1484 | ||
| 1485 | ;; (defvar symbol-file-load-history-loaded nil | ||
| 1486 | ;; "Non-nil means we have loaded the file `fns-VERSION.el' in `exec-directory'. | ||
| 1487 | ;; That file records the part of `load-history' for preloaded files, | ||
| 1488 | ;; which is cleared out before dumping to make Emacs smaller.") | ||
| 1489 | |||
| 1490 | ;; (defun load-symbol-file-load-history () | ||
| 1491 | ;; "Load the file `fns-VERSION.el' in `exec-directory' if not already done. | ||
| 1492 | ;; That file records the part of `load-history' for preloaded files, | ||
| 1493 | ;; which is cleared out before dumping to make Emacs smaller." | ||
| 1494 | ;; (unless symbol-file-load-history-loaded | ||
| 1495 | ;; (load (expand-file-name | ||
| 1496 | ;; ;; fns-XX.YY.ZZ.el does not work on DOS filesystem. | ||
| 1497 | ;; (if (eq system-type 'ms-dos) | ||
| 1498 | ;; "fns.el" | ||
| 1499 | ;; (format "fns-%s.el" emacs-version)) | ||
| 1500 | ;; exec-directory) | ||
| 1501 | ;; ;; The file name fns-%s.el already has a .el extension. | ||
| 1502 | ;; nil nil t) | ||
| 1503 | ;; (setq symbol-file-load-history-loaded t))) | ||
| 1504 | |||
| 1505 | (defun symbol-file (symbol &optional type) | 1485 | (defun symbol-file (symbol &optional type) |
| 1506 | "Return the name of the file that defined SYMBOL. | 1486 | "Return the name of the file that defined SYMBOL. |
| 1507 | The value is normally an absolute file name. It can also be nil, | 1487 | The value is normally an absolute file name. It can also be nil, |