summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/emacs-lisp/cl-lib.el2
2 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5dba3964f1c..b9e633f976d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,17 +1,20 @@
+2012-12-10 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * emacs-lisp/cl-lib.el (cl-declaim): Paren typo.
+
2012-12-09 Eli Zaretskii <eliz@gnu.org>
Parallelize byte compilation on MS-Windows.
* makefile.w32-in (WINS_BASIC1, WINS_BASIC2, WINS_BASIC3)
- (WINS_BASIC4): New variables, subdivide subdirectories into 4
- parts.
+ (WINS_BASIC4): New variables, subdivide subdirectories into 4 parts.
(WINS_BASIC): Define as concatenation of the above.
(compile): Subdivide into 4 separate and independent jobs that can
be run in parallel.
(compile0-CMD, compile0-SH): New targets for compiling
COMPILE_FIRST files, which are prerequisites for the rest of the
byte-compilation.
- (compile1-CMD, compile2-CMD, compile3-CMD, compile4-CMD): New
- targets for parallel compilation with cmd.exe.
+ (compile1-CMD, compile2-CMD, compile3-CMD, compile4-CMD):
+ New targets for parallel compilation with cmd.exe.
(compile1-SH, compile2-SH, compile3-SH, compile4-SH): Ditto for
compiling under a Unixy shell.
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 8120c87de16..55f6ac94c2b 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -260,7 +260,7 @@ one value.
"Like `cl-proclaim', but takes any number of unevaluated, unquoted arguments.
Puts `(cl-eval-when (compile load eval) ...)' around the declarations
so that they are registered at compile-time as well as run-time."
- (let ((body (mapcar (lambda (x) `(cl-proclaim ',x) specs))))
+ (let ((body (mapcar (lambda (x) `(cl-proclaim ',x)) specs)))
(if (cl--compiling-file) `(cl-eval-when (compile load eval) ,@body)
`(progn ,@body)))) ; Avoid loading cl-macs.el for cl-eval-when.