aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-10-31 19:55:12 -0700
committerGlenn Morris2010-10-31 19:55:12 -0700
commitfeb5e60ae796691a61e9a4078a0dff0111fcae31 (patch)
tree7c2dd0f23597ee7897fc184b59714728af28a0fa
parent1f023ca9aea39dcb14d3ec5f6dee43303419700e (diff)
downloademacs-feb5e60ae796691a61e9a4078a0dff0111fcae31.tar.gz
emacs-feb5e60ae796691a61e9a4078a0dff0111fcae31.zip
* lisp/emacs-lisp/bytecomp.el (byte-recompile-file): Fix previous change.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/bytecomp.el3
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45bee01c97d..6a2df683e40 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12010-11-01 Glenn Morris <rgm@gnu.org> 12010-11-01 Glenn Morris <rgm@gnu.org>
2 2
3 * emacs-lisp/bytecomp.el (byte-recompile-file): Fix previous change.
4
3 * startup.el (package-enable-at-startup, package-initialize): 5 * startup.el (package-enable-at-startup, package-initialize):
4 Silence compiler. 6 Silence compiler.
5 7
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 5afe49346b5..952b69f7ce3 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1631,7 +1631,7 @@ or 'no-byte-compile if the file did not need recompilation."
1631 bytecomp-filename "? ")))) 1631 bytecomp-filename "? "))))
1632 (progn 1632 (progn
1633 (if (and noninteractive (not byte-compile-verbose)) 1633 (if (and noninteractive (not byte-compile-verbose))
1634 (message "Compiling %s..." bytecomp-source)) 1634 (message "Compiling %s..." bytecomp-filename))
1635 (byte-compile-file bytecomp-filename load)) 1635 (byte-compile-file bytecomp-filename load))
1636 (when load (load bytecomp-filename)) 1636 (when load (load bytecomp-filename))
1637 'no-byte-compile))) 1637 'no-byte-compile)))
@@ -4349,5 +4349,4 @@ and corresponding effects."
4349 4349
4350(run-hooks 'bytecomp-load-hook) 4350(run-hooks 'bytecomp-load-hook)
4351 4351
4352;; arch-tag: 9c97b0f0-8745-4571-bfc3-8dceb677292a
4353;;; bytecomp.el ends here 4352;;; bytecomp.el ends here