aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-04-27 03:50:12 +0000
committerRichard M. Stallman2002-04-27 03:50:12 +0000
commit3fad47d896a4094bd33a2e012232948161a4eb12 (patch)
treecdd0040b3d2bd905b5185a4204ac0afa34824915
parentad871438dd510157fc150a6006016503567b969f (diff)
downloademacs-3fad47d896a4094bd33a2e012232948161a4eb12.tar.gz
emacs-3fad47d896a4094bd33a2e012232948161a4eb12.zip
Explicitly load cus-face and timer.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/loadup.el2
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17f3060d944..7721b87f3d1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,12 @@
5 5
62002-04-26 Richard M. Stallman <rms@gnu.org> 62002-04-26 Richard M. Stallman <rms@gnu.org>
7 7
8 * loadup.el: Explicitly load cus-face and timer.
9
10 * isearch.el: Don't require timer.
11
12 * faces.el: Don't require cus-face.
13
8 * cus-edit.el (customize-face): Use read-face-name 14 * cus-edit.el (customize-face): Use read-face-name
9 and handle multiple faces. 15 and handle multiple faces.
10 (customize-face-other-window): Make it work similarly. 16 (customize-face-other-window): Make it work similarly.
diff --git a/lisp/loadup.el b/lisp/loadup.el
index c107c2e41c1..e0cb78ef015 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -67,6 +67,7 @@
67(load "simple") 67(load "simple")
68(load "files") 68(load "files")
69 69
70(load "cus-face")
70(load "faces") ; after here, `defface' may be used. 71(load "faces") ; after here, `defface' may be used.
71 72
72(message "Lists of integers (garbage collection statistics) are normal output") 73(message "Lists of integers (garbage collection statistics) are normal output")
@@ -134,6 +135,7 @@
134 (and (boundp 'x-toolkit-scroll-bars) 135 (and (boundp 'x-toolkit-scroll-bars)
135 (load "scroll-bar")) 136 (load "scroll-bar"))
136 (load "select"))) 137 (load "select")))
138(load "timer")
137(load "isearch") 139(load "isearch")
138 140
139(message "%s" (garbage-collect)) 141(message "%s" (garbage-collect))