diff options
| author | Eli Zaretskii | 2008-04-12 09:26:40 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2008-04-12 09:26:40 +0000 |
| commit | beec574c904d6bdcf8af1c8cc3b4b5625d8e2aa3 (patch) | |
| tree | 709916c7d34132bb03ec189ead6a9f13b0f373b6 | |
| parent | f5acc0717259c46dbe2660358dca316957aaa5d7 (diff) | |
| download | emacs-beec574c904d6bdcf8af1c8cc3b4b5625d8e2aa3.tar.gz emacs-beec574c904d6bdcf8af1c8cc3b4b5625d8e2aa3.zip | |
("minibuffer"): Move after "faces".
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/loadup.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 53b5713a1a6..b8b54ab8107 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-04-12 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * loadup.el ("minibuffer"): Move after "faces". | ||
| 4 | |||
| 1 | 2008-04-12 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2008-04-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * progmodes/hideif.el (hif-factor): Handle unary minus. | 7 | * progmodes/hideif.el (hif-factor): Handle unary minus. |
diff --git a/lisp/loadup.el b/lisp/loadup.el index 8581f05fedb..005c5ea25b8 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el | |||
| @@ -67,13 +67,13 @@ | |||
| 67 | (load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake. | 67 | (load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake. |
| 68 | (load "env") | 68 | (load "env") |
| 69 | (load "format") | 69 | (load "format") |
| 70 | (load "minibuffer") | ||
| 71 | (load "bindings") | 70 | (load "bindings") |
| 72 | (setq load-source-file-function 'load-with-code-conversion) | 71 | (setq load-source-file-function 'load-with-code-conversion) |
| 73 | (load "files") | 72 | (load "files") |
| 74 | 73 | ||
| 75 | (load "cus-face") | 74 | (load "cus-face") |
| 76 | (load "faces") ; after here, `defface' may be used. | 75 | (load "faces") ; after here, `defface' may be used. |
| 76 | (load "minibuffer") | ||
| 77 | 77 | ||
| 78 | (load "button") | 78 | (load "button") |
| 79 | (load "startup") | 79 | (load "startup") |