diff options
| author | Juanma Barranquero | 2008-04-10 09:53:56 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-04-10 09:53:56 +0000 |
| commit | f01d54ca92320c28c16accd9bfecb371bad74573 (patch) | |
| tree | 0242eaec58c7b756fa2a872326754f16e7f8aac0 | |
| parent | f12da103169ed744997445d57e35f30d48a04227 (diff) | |
| download | emacs-f01d54ca92320c28c16accd9bfecb371bad74573.tar.gz emacs-f01d54ca92320c28c16accd9bfecb371bad74573.zip | |
(AUTOGENEL): Add calc-loaddefs.el.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 84fa0a02a57..0fc3194de5c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-04-10 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * makefile.w32-in (AUTOGENEL): Add calc-loaddefs.el. | ||
| 4 | |||
| 1 | 2008-04-10 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2008-04-10 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 6 | ||
| 3 | * vc-hooks.el (vc-state): Add new state `conflict'. | 7 | * vc-hooks.el (vc-state): Add new state `conflict'. |
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index f2a8111f99d..82c39759657 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in | |||
| @@ -62,7 +62,8 @@ LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \ | |||
| 62 | $(lisp)/mh-e/mh-loaddefs.el | 62 | $(lisp)/mh-e/mh-loaddefs.el |
| 63 | 63 | ||
| 64 | AUTOGENEL = $(lisp)/loaddefs.el $(LOADDEFS) $(lisp)/cus-load.el \ | 64 | AUTOGENEL = $(lisp)/loaddefs.el $(LOADDEFS) $(lisp)/cus-load.el \ |
| 65 | $(lisp)/finder-inf.el $(lisp)/subdirs.el $(lisp)/eshell/esh-groups.el | 65 | $(lisp)/finder-inf.el $(lisp)/subdirs.el $(lisp)/eshell/esh-groups.el \ |
| 66 | $(lisp)/calc/calc-loaddefs.el | ||
| 66 | 67 | ||
| 67 | # Files to compile before others during a bootstrap. This is done to | 68 | # Files to compile before others during a bootstrap. This is done to |
| 68 | # speed up the bootstrap process. The CC files are compiled first | 69 | # speed up the bootstrap process. The CC files are compiled first |