diff options
| author | Karoly Lorentey | 2006-02-03 14:44:51 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-02-03 14:44:51 +0000 |
| commit | 911650d26b9ce191925ec23545b0c072cdab351f (patch) | |
| tree | 9bb29ae17b08a36409503407d7a964e3d2c7b0e0 | |
| parent | 0a7114a4e535e70b237b15817988344a03fe7ab1 (diff) | |
| download | emacs-911650d26b9ce191925ec23545b0c072cdab351f.tar.gz emacs-911650d26b9ce191925ec23545b0c072cdab351f.zip | |
Fix bootstrapping problem. (Reported by "mace".)
* lisp/loadup.el: Delay loading env; mule-conf gets confused by cl during
bootstrap.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-505
| -rw-r--r-- | README.multi-tty | 1 | ||||
| -rw-r--r-- | lisp/loadup.el | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/README.multi-tty b/README.multi-tty index ac5d5667c52..d7b9659b9dd 100644 --- a/README.multi-tty +++ b/README.multi-tty | |||
| @@ -46,6 +46,7 @@ Yoshiaki Kasahara <kasahara@nc.kyushu-u.ac.jp> | |||
| 46 | Bas Kok <nekkobassu@yahoo.com> | 46 | Bas Kok <nekkobassu@yahoo.com> |
| 47 | Jurej Kubelka <Juraj.Kubelka@email.cz> | 47 | Jurej Kubelka <Juraj.Kubelka@email.cz> |
| 48 | David Lichteblau <david@lichteblau.com> | 48 | David Lichteblau <david@lichteblau.com> |
| 49 | mace <mace@kirjakaapeli.lib.hel.fi> | ||
| 49 | Xavier Mallard <zedek@gnu-rox.org> | 50 | Xavier Mallard <zedek@gnu-rox.org> |
| 50 | Istvan Marko <mi-mtty@kismala.com> | 51 | Istvan Marko <mi-mtty@kismala.com> |
| 51 | Ted Morse <morse@ciholas.com> | 52 | Ted Morse <morse@ciholas.com> |
diff --git a/lisp/loadup.el b/lisp/loadup.el index e5bcf2447ff..5e1f455ab05 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el | |||
| @@ -60,10 +60,10 @@ | |||
| 60 | (load "widget") | 60 | (load "widget") |
| 61 | (load "custom") | 61 | (load "custom") |
| 62 | (load "emacs-lisp/map-ynp") | 62 | (load "emacs-lisp/map-ynp") |
| 63 | (load "env") | ||
| 64 | (load "cus-start") | 63 | (load "cus-start") |
| 65 | (load "international/mule") | 64 | (load "international/mule") |
| 66 | (load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake. | 65 | (load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake. |
| 66 | (load "env") | ||
| 67 | (load "format") | 67 | (load "format") |
| 68 | (load "bindings") | 68 | (load "bindings") |
| 69 | (setq load-source-file-function 'load-with-code-conversion) | 69 | (setq load-source-file-function 'load-with-code-conversion) |