aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-06-20 20:00:14 +0000
committerStefan Monnier2008-06-20 20:00:14 +0000
commitcf653c8c3617ec132000160b9fa217c7814a4d55 (patch)
treee05a1211fce5d0704b403fe8dcf265c70f7a58e0
parentb705155a621a65f1f8a5dd07edec647ab2ed27f9 (diff)
downloademacs-cf653c8c3617ec132000160b9fa217c7814a4d55.tar.gz
emacs-cf653c8c3617ec132000160b9fa217c7814a4d55.zip
($(lisp)/progmodes/cc-mode.elc): Pass the .el file not
the .elc file to batch-byte-compile.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/Makefile.in2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b6f336192d..5188d160710 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12008-06-20 Stefan Monnier <monnier@iro.umontreal.ca> 12008-06-20 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * Makefile.in ($(lisp)/progmodes/cc-mode.elc): Pass the .el file not
4 the .elc file to batch-byte-compile.
5
3 * progmodes/cc-mode.el (c-make-inherited-keymap): Only use 6 * progmodes/cc-mode.el (c-make-inherited-keymap): Only use
4 set-keymap-parents if set-keymap-parent doesn't exist. 7 set-keymap-parents if set-keymap-parent doesn't exist.
5 8
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 4c5c82239f7..a9c41a53311 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1324,7 +1324,7 @@ $(lisp)/progmodes/cc-mode.elc: \
1324 $(lisp)/progmodes/cc-mode.el \ 1324 $(lisp)/progmodes/cc-mode.el \
1325 $(lisp)/progmodes/cc-langs.el \ 1325 $(lisp)/progmodes/cc-langs.el \
1326 $(lisp)/progmodes/cc-defs.el 1326 $(lisp)/progmodes/cc-defs.el
1327 $(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $@ 1327 $(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $<
1328 1328
1329# Update MH-E internal autoloads. These are not to be confused with 1329# Update MH-E internal autoloads. These are not to be confused with
1330# the autoloads for the MH-E entry points, which are already in loaddefs.el. 1330# the autoloads for the MH-E entry points, which are already in loaddefs.el.