diff options
| author | Juanma Barranquero | 2011-03-11 16:34:07 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2011-03-11 16:34:07 +0100 |
| commit | 9c5047fb4e78dfc1d8667e06947f5660dcf234eb (patch) | |
| tree | 01ed09baad240c0e2b607d210e804bdfc4372662 | |
| parent | 6dbf95e5b3cf85fce57a5cdd67e7e50b8acb8787 (diff) | |
| download | emacs-9c5047fb4e78dfc1d8667e06947f5660dcf234eb.tar.gz emacs-9c5047fb4e78dfc1d8667e06947f5660dcf234eb.zip | |
Backport 2011-03-01T03:59:31Z!lekktu@gmail.com from trunk.
*lisp/emacs-lisp/cl-macs.el (lexical-let*): Fix argument name in docstring.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-loaddefs.el | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d84f98a1322..e368e660fe2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-03-11 Juanma Barranquero <lekktu@gmail.com> | 1 | 2011-03-11 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | Backport revno:103463 from trunk. | ||
| 4 | * emacs-lisp/cl-macs.el (lexical-let*): Fix argument name in docstring. | ||
| 5 | |||
| 3 | Backport revno:103622 from trunk. | 6 | Backport revno:103622 from trunk. |
| 4 | * help-fns.el (describe-variable): Don't complete keywords. | 7 | * help-fns.el (describe-variable): Don't complete keywords. |
| 5 | Suggested by Teodor Zlatanov <tzz@lifelogs.com>. | 8 | Suggested by Teodor Zlatanov <tzz@lifelogs.com>. |
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index 835d26ed585..2fb7c0434b5 100644 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el | |||
| @@ -282,7 +282,7 @@ Not documented | |||
| 282 | ;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist | 282 | ;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist |
| 283 | ;;;;;; do* do loop return-from return block etypecase typecase ecase | 283 | ;;;;;; do* do loop return-from return block etypecase typecase ecase |
| 284 | ;;;;;; case load-time-value eval-when destructuring-bind function* | 284 | ;;;;;; case load-time-value eval-when destructuring-bind function* |
| 285 | ;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "75e86ac663887b54bf1778f2dd028463") | 285 | ;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "12451ac01f94f10d30cf7a8f92625c42") |
| 286 | ;;; Generated autoloads from cl-macs.el | 286 | ;;; Generated autoloads from cl-macs.el |
| 287 | 287 | ||
| 288 | (autoload 'gensym "cl-macs" "\ | 288 | (autoload 'gensym "cl-macs" "\ |
| @@ -505,7 +505,7 @@ lexical closures as in Common Lisp. | |||
| 505 | (autoload 'lexical-let* "cl-macs" "\ | 505 | (autoload 'lexical-let* "cl-macs" "\ |
| 506 | Like `let*', but lexically scoped. | 506 | Like `let*', but lexically scoped. |
| 507 | The main visible difference is that lambdas inside BODY, and in | 507 | The main visible difference is that lambdas inside BODY, and in |
| 508 | successive bindings within BINDINGS, will create lexical closures | 508 | successive bindings within VARLIST, will create lexical closures |
| 509 | as in Common Lisp. This is similar to the behavior of `let*' in | 509 | as in Common Lisp. This is similar to the behavior of `let*' in |
| 510 | Common Lisp. | 510 | Common Lisp. |
| 511 | 511 | ||
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 4061e570cef..3e9d7c27258 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el | |||
| @@ -1455,7 +1455,7 @@ lexical closures as in Common Lisp. | |||
| 1455 | (defmacro lexical-let* (bindings &rest body) | 1455 | (defmacro lexical-let* (bindings &rest body) |
| 1456 | "Like `let*', but lexically scoped. | 1456 | "Like `let*', but lexically scoped. |
| 1457 | The main visible difference is that lambdas inside BODY, and in | 1457 | The main visible difference is that lambdas inside BODY, and in |
| 1458 | successive bindings within BINDINGS, will create lexical closures | 1458 | successive bindings within VARLIST, will create lexical closures |
| 1459 | as in Common Lisp. This is similar to the behavior of `let*' in | 1459 | as in Common Lisp. This is similar to the behavior of `let*' in |
| 1460 | Common Lisp. | 1460 | Common Lisp. |
| 1461 | \n(fn VARLIST BODY)" | 1461 | \n(fn VARLIST BODY)" |