diff options
| author | Stefan Monnier | 2012-07-17 08:58:25 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-07-17 08:58:25 -0400 |
| commit | 88ecaf8fa55e7bd0a76c9ea0bda93dbc063f3036 (patch) | |
| tree | 05ecdd9809aac60f7e3b776058526f9d4f023d80 | |
| parent | ef501ef01cd3d3168da15cf5426f1be119fc90c8 (diff) | |
| download | emacs-88ecaf8fa55e7bd0a76c9ea0bda93dbc063f3036.tar.gz emacs-88ecaf8fa55e7bd0a76c9ea0bda93dbc063f3036.zip | |
* lisp/emacs-lisp/cl-macs.el (cl-progv): Use a properly prefixed var name.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-loaddefs.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 320da46f186..34fe5a509f4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,12 +1,13 @@ | |||
| 1 | 2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * emacs-lisp/cl-macs.el (cl-progv): Use a properly prefixed var name. | ||
| 4 | |||
| 3 | * emacs-lisp/elint.el (elint-find-args-in-code): | 5 | * emacs-lisp/elint.el (elint-find-args-in-code): |
| 4 | Use help-function-arglist, so as to handle lexical byte-code. | 6 | Use help-function-arglist, so as to handle lexical byte-code. |
| 5 | 7 | ||
| 6 | * progmodes/sh-script.el (sh-syntax-propertize-function): Fix last | 8 | * progmodes/sh-script.el (sh-syntax-propertize-function): Fix last |
| 7 | change (bug#11826). | 9 | change (bug#11826). |
| 8 | 10 | ||
| 9 | 2012-07-17 Glenn Morris <rgm@gnu.org> | ||
| 10 | 2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca> | 11 | 2012-07-17 Stefan Monnier <monnier@iro.umontreal.ca> |
| 11 | 12 | ||
| 12 | * progmodes/cc-engine.el (c-forward-sws, c-backward-sws): | 13 | * progmodes/cc-engine.el (c-forward-sws, c-backward-sws): |
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index 947fa9513bb..f22bda1559a 100644 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el | |||
| @@ -260,7 +260,7 @@ Remove from SYMBOL's plist the property PROPNAME and its value. | |||
| 260 | ;;;;;; cl-do cl-loop cl-return-from cl-return cl-block cl-etypecase | 260 | ;;;;;; cl-do cl-loop cl-return-from cl-return cl-block cl-etypecase |
| 261 | ;;;;;; cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when | 261 | ;;;;;; cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when |
| 262 | ;;;;;; cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp | 262 | ;;;;;; cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp |
| 263 | ;;;;;; cl-gensym) "cl-macs" "cl-macs.el" "a175c7714223c21a617b0460e130f1d8") | 263 | ;;;;;; cl-gensym) "cl-macs" "cl-macs.el" "6b06545d8d17e8b902435f08be6ac0c2") |
| 264 | ;;; Generated autoloads from cl-macs.el | 264 | ;;; Generated autoloads from cl-macs.el |
| 265 | 265 | ||
| 266 | (autoload 'cl-gensym "cl-macs" "\ | 266 | (autoload 'cl-gensym "cl-macs" "\ |
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 31d20f274ed..70d907a14c1 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el | |||
| @@ -1547,7 +1547,7 @@ second list (or made unbound if VALUES is shorter than SYMBOLS); then the | |||
| 1547 | BODY forms are executed and their result is returned. This is much like | 1547 | BODY forms are executed and their result is returned. This is much like |
| 1548 | a `let' form, except that the list of symbols can be computed at run-time." | 1548 | a `let' form, except that the list of symbols can be computed at run-time." |
| 1549 | (declare (indent 2) (debug (form form body))) | 1549 | (declare (indent 2) (debug (form form body))) |
| 1550 | (let ((bodyfun (make-symbol "body")) | 1550 | (let ((bodyfun (make-symbol "cl--progv-body")) |
| 1551 | (binds (make-symbol "binds")) | 1551 | (binds (make-symbol "binds")) |
| 1552 | (syms (make-symbol "syms")) | 1552 | (syms (make-symbol "syms")) |
| 1553 | (vals (make-symbol "vals"))) | 1553 | (vals (make-symbol "vals"))) |