diff options
| author | Stefan Monnier | 2012-12-09 20:32:36 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2012-12-09 20:32:36 -0500 |
| commit | bad162fd1bc6134158eb097aa4ea21b881c9ef1c (patch) | |
| tree | 132cf9a4790a051c579460957ce4ec024ceed59e | |
| parent | 8d1a544c118268dcd72633c69b920800cdb167ee (diff) | |
| download | emacs-bad162fd1bc6134158eb097aa4ea21b881c9ef1c.tar.gz emacs-bad162fd1bc6134158eb097aa4ea21b881c9ef1c.zip | |
* lisp/emacs-lisp/cl-lib.el (cl-declaim): Paren typo.
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-lib.el | 2 |
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 @@ | |||
| 1 | 2012-12-10 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * emacs-lisp/cl-lib.el (cl-declaim): Paren typo. | ||
| 4 | |||
| 1 | 2012-12-09 Eli Zaretskii <eliz@gnu.org> | 5 | 2012-12-09 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | Parallelize byte compilation on MS-Windows. | 7 | Parallelize byte compilation on MS-Windows. |
| 4 | * makefile.w32-in (WINS_BASIC1, WINS_BASIC2, WINS_BASIC3) | 8 | * makefile.w32-in (WINS_BASIC1, WINS_BASIC2, WINS_BASIC3) |
| 5 | (WINS_BASIC4): New variables, subdivide subdirectories into 4 | 9 | (WINS_BASIC4): New variables, subdivide subdirectories into 4 parts. |
| 6 | parts. | ||
| 7 | (WINS_BASIC): Define as concatenation of the above. | 10 | (WINS_BASIC): Define as concatenation of the above. |
| 8 | (compile): Subdivide into 4 separate and independent jobs that can | 11 | (compile): Subdivide into 4 separate and independent jobs that can |
| 9 | be run in parallel. | 12 | be run in parallel. |
| 10 | (compile0-CMD, compile0-SH): New targets for compiling | 13 | (compile0-CMD, compile0-SH): New targets for compiling |
| 11 | COMPILE_FIRST files, which are prerequisites for the rest of the | 14 | COMPILE_FIRST files, which are prerequisites for the rest of the |
| 12 | byte-compilation. | 15 | byte-compilation. |
| 13 | (compile1-CMD, compile2-CMD, compile3-CMD, compile4-CMD): New | 16 | (compile1-CMD, compile2-CMD, compile3-CMD, compile4-CMD): |
| 14 | targets for parallel compilation with cmd.exe. | 17 | New targets for parallel compilation with cmd.exe. |
| 15 | (compile1-SH, compile2-SH, compile3-SH, compile4-SH): Ditto for | 18 | (compile1-SH, compile2-SH, compile3-SH, compile4-SH): Ditto for |
| 16 | compiling under a Unixy shell. | 19 | compiling under a Unixy shell. |
| 17 | 20 | ||
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. | |||
| 260 | "Like `cl-proclaim', but takes any number of unevaluated, unquoted arguments. | 260 | "Like `cl-proclaim', but takes any number of unevaluated, unquoted arguments. |
| 261 | Puts `(cl-eval-when (compile load eval) ...)' around the declarations | 261 | Puts `(cl-eval-when (compile load eval) ...)' around the declarations |
| 262 | so that they are registered at compile-time as well as run-time." | 262 | so that they are registered at compile-time as well as run-time." |
| 263 | (let ((body (mapcar (lambda (x) `(cl-proclaim ',x) specs)))) | 263 | (let ((body (mapcar (lambda (x) `(cl-proclaim ',x)) specs))) |
| 264 | (if (cl--compiling-file) `(cl-eval-when (compile load eval) ,@body) | 264 | (if (cl--compiling-file) `(cl-eval-when (compile load eval) ,@body) |
| 265 | `(progn ,@body)))) ; Avoid loading cl-macs.el for cl-eval-when. | 265 | `(progn ,@body)))) ; Avoid loading cl-macs.el for cl-eval-when. |
| 266 | 266 | ||