[Emacs-diffs] Changes to emacs/lisp/loadup.el

[Stefan Monnier]

Index: emacs/lisp/loadup.el
diff -c emacs/lisp/loadup.el:1.119 emacs/lisp/loadup.el:1.120
*** emacs/lisp/loadup.el:1.119  Mon Mar 18 15:20:44 2002
--- emacs/lisp/loadup.el        Mon Apr  8 18:22:01 2002
***************
*** 114,120 ****
  (load "language/georgian")
  
  (load "international/ucs-tables")
! (unify-8859-on-encoding-mode 1)
  
  (update-coding-systems-internal)
  
--- 114,120 ----
  (load "language/georgian")
  
  (load "international/ucs-tables")
! (ucs-unify-8859 'encode-only)
  
  (update-coding-systems-internal)
  
***************
*** 248,280 ****
  
  ;; 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))
  (set-buffer-modified-p nil)
  
  ;; reset the load-path.  See lread.c:init_lread why.
--- 248,286 ----
  
  ;; 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.
! ;; 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)
  
  ;; reset the load-path.  See lread.c:init_lread why.