From 86db31d56a1a2507b210f5acb2b918745cef074e Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 18 Mar 2002 20:21:56 +0000 Subject: [PATCH] ("emacs-lisp/backquote"): Load earlier. ("international/ucs-tables"): Load and turn on unify-8859-on-encoding-mode unconditionally. (emacs-version): Use `defconst' rather than `setq'. --- lisp/ChangeLog | 9 +++++++-- lisp/loadup.el | 22 +++++++++++++++------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f45bd385f7d..10f2dc9636a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,8 +2,8 @@ * vc-rcs.el (vc-rcs-register): Fix handling of vc-[rcs-]register-switches. - (vc-rcs-checkin-switches, vc-rcs-checkout-switches): Variables - removed, since they weren't used yet. + (vc-rcs-checkin-switches, vc-rcs-checkout-switches): + Variables removed, since they weren't used yet. * vc-cvs.el (vc-cvs-register): Fix handling of vc-[cvs-]register-switches. @@ -13,6 +13,11 @@ 2002-03-18 Stefan Monnier + * loadup.el ("emacs-lisp/backquote"): Load earlier. + ("international/ucs-tables"): Load and turn on + unify-8859-on-encoding-mode unconditionally. + (emacs-version): Use `defconst' rather than `setq'. + * eshell/esh-ext.el (eshell-binary-suffixes): Use exec-suffixes. 2002-03-18 Richard M. Stallman diff --git a/lisp/loadup.el b/lisp/loadup.el index 2fe4330c9ec..871d8eb19a7 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -42,10 +42,11 @@ (message "Using load-path %s" load-path) -;;; We don't want to have any undo records in the dumped Emacs. +;; We don't want to have any undo records in the dumped Emacs. (buffer-disable-undo "*scratch*") (load "byte-run") +(load "emacs-lisp/backquote") (load "subr") ;; We specify .el in case someone compiled version.el by mistake. @@ -53,7 +54,6 @@ (load "widget") (load "custom") -(load "emacs-lisp/backquote") (load "map-ynp") (load "env") (load "cus-start") @@ -112,6 +112,10 @@ (load "language/misc-lang") (load "language/utf-8-lang") (load "language/georgian") + +(load "international/ucs-tables") +(unify-8859-on-encoding-mode 1) + (update-coding-systems-internal) (load "indent") @@ -205,11 +209,10 @@ (versions (mapcar (function (lambda (name) (string-to-int (substring name (length base))))) files))) - (setq emacs-version (format "%s.%d" - emacs-version - (if versions - (1+ (apply 'max versions)) - 1))))) + ;; `emacs-version' is a constant, so we shouldn't change it with `setq'. + (defconst emacs-version + (format "%s.%d" + emacs-version (if versions (1+ (apply 'max versions)) 1))))) ;; Note: all compiled Lisp files loaded above this point ;; must be among the ones parsed by make-docfile @@ -331,4 +334,9 @@ (eval top-level) + +;;; Local Variables: +;;; no-byte-compile: t +;;; no-update-autoloads: t +;;; End: ;;; loadup.el ends here -- 2.39.2