diff options
| author | Juanma Barranquero | 2012-06-23 18:58:13 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2012-06-23 18:58:13 +0200 |
| commit | 711b11e1e3efa0d85e3a54114bf7dbd9a90b5c54 (patch) | |
| tree | ce025833fc6038429c3b77e1a75cc1ade5cc868e | |
| parent | ca300656a5e69cc0b93aab252a4f761539f02c25 (diff) | |
| download | emacs-711b11e1e3efa0d85e3a54114bf7dbd9a90b5c54.tar.gz emacs-711b11e1e3efa0d85e3a54114bf7dbd9a90b5c54.zip | |
lisp/makefile.w32-in (COMPILE_FIRST): Synch with changes in 2012-06-22T21:24:54Z!monnier@iro.umontreal.ca.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d157c36e36f..569dd004f76 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-06-23 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * makefile.w32-in (COMPILE_FIRST): Synch with changes in 2012-06-22T21:24:54Z!monnier@iro.umontreal.ca. | ||
| 4 | |||
| 1 | 2012-06-23 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2012-06-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * help-fns.el (describe-variable): Don't croak when doc is not found. | 7 | * help-fns.el (describe-variable): Don't croak when doc is not found. |
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 2137607281a..91a25b7c071 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in | |||
| @@ -79,10 +79,10 @@ BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS) | |||
| 79 | # speed up the bootstrap process. | 79 | # speed up the bootstrap process. |
| 80 | 80 | ||
| 81 | COMPILE_FIRST = \ | 81 | COMPILE_FIRST = \ |
| 82 | $(lisp)/emacs-lisp/bytecomp.el \ | ||
| 83 | $(lisp)/emacs-lisp/byte-opt.el \ | ||
| 84 | $(lisp)/emacs-lisp/macroexp.el \ | 82 | $(lisp)/emacs-lisp/macroexp.el \ |
| 85 | $(lisp)/emacs-lisp/cconv.el \ | 83 | $(lisp)/emacs-lisp/cconv.el \ |
| 84 | $(lisp)/emacs-lisp/byte-opt.el \ | ||
| 85 | $(lisp)/emacs-lisp/bytecomp.el \ | ||
| 86 | $(lisp)/emacs-lisp/autoload.el | 86 | $(lisp)/emacs-lisp/autoload.el |
| 87 | 87 | ||
| 88 | # The actual Emacs command run in the targets below. | 88 | # The actual Emacs command run in the targets below. |