diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8171f7ba446..fabbfdf1737 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-07-12 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * emacs-lisp/cl-macs.el (cl-multiple-value-bind, cl-multiple-value-setq) | ||
| 4 | (cl-the, cl-declare, cl-defstruct): Fix typos in docstrings. | ||
| 5 | |||
| 1 | 2013-07-12 Leo Liu <sdl.web@gmail.com> | 6 | 2013-07-12 Leo Liu <sdl.web@gmail.com> |
| 2 | 7 | ||
| 3 | * ido.el (dired-do-copy, dired): Set 'ido property. (Bug#11954) | 8 | * ido.el (dired-do-copy, dired): Set 'ido property. (Bug#11954) |
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 3cf744f1245..c47c9b61030 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el | |||
| @@ -1957,7 +1957,7 @@ by EXPANSION, and (setq NAME ...) will act like (setf EXPANSION ...). | |||
| 1957 | "Collect multiple return values. | 1957 | "Collect multiple return values. |
| 1958 | FORM must return a list; the BODY is then executed with the first N elements | 1958 | FORM must return a list; the BODY is then executed with the first N elements |
| 1959 | of this list bound (`let'-style) to each of the symbols SYM in turn. This | 1959 | of this list bound (`let'-style) to each of the symbols SYM in turn. This |
| 1960 | is analogous to the Common Lisp `cl-multiple-value-bind' macro, using lists to | 1960 | is analogous to the Common Lisp `multiple-value-bind' macro, using lists to |
| 1961 | simulate true multiple return values. For compatibility, (cl-values A B C) is | 1961 | simulate true multiple return values. For compatibility, (cl-values A B C) is |
| 1962 | a synonym for (list A B C). | 1962 | a synonym for (list A B C). |
| 1963 | 1963 | ||
| @@ -1975,7 +1975,7 @@ a synonym for (list A B C). | |||
| 1975 | "Collect multiple return values. | 1975 | "Collect multiple return values. |
| 1976 | FORM must return a list; the first N elements of this list are stored in | 1976 | FORM must return a list; the first N elements of this list are stored in |
| 1977 | each of the symbols SYM in turn. This is analogous to the Common Lisp | 1977 | each of the symbols SYM in turn. This is analogous to the Common Lisp |
| 1978 | `cl-multiple-value-setq' macro, using lists to simulate true multiple return | 1978 | `multiple-value-setq' macro, using lists to simulate true multiple return |
| 1979 | values. For compatibility, (cl-values A B C) is a synonym for (list A B C). | 1979 | values. For compatibility, (cl-values A B C) is a synonym for (list A B C). |
| 1980 | 1980 | ||
| 1981 | \(fn (SYM...) FORM)" | 1981 | \(fn (SYM...) FORM)" |
| @@ -2002,7 +2002,7 @@ values. For compatibility, (cl-values A B C) is a synonym for (list A B C). | |||
| 2002 | (cons 'progn body)) | 2002 | (cons 'progn body)) |
| 2003 | ;;;###autoload | 2003 | ;;;###autoload |
| 2004 | (defmacro cl-the (_type form) | 2004 | (defmacro cl-the (_type form) |
| 2005 | "At present this ignores _TYPE and is simply equivalent to FORM." | 2005 | "At present this ignores TYPE and is simply equivalent to FORM." |
| 2006 | (declare (indent 1) (debug (cl-type-spec form))) | 2006 | (declare (indent 1) (debug (cl-type-spec form))) |
| 2007 | form) | 2007 | form) |
| 2008 | 2008 | ||
| @@ -2059,7 +2059,7 @@ values. For compatibility, (cl-values A B C) is a synonym for (list A B C). | |||
| 2059 | "Declare SPECS about the current function while compiling. | 2059 | "Declare SPECS about the current function while compiling. |
| 2060 | For instance | 2060 | For instance |
| 2061 | 2061 | ||
| 2062 | \(cl-declare (warn 0)) | 2062 | (cl-declare (warn 0)) |
| 2063 | 2063 | ||
| 2064 | will turn off byte-compile warnings in the function. | 2064 | will turn off byte-compile warnings in the function. |
| 2065 | See Info node `(cl)Declarations' for details." | 2065 | See Info node `(cl)Declarations' for details." |
| @@ -2279,8 +2279,8 @@ KEYWORD can be one of :conc-name, :constructor, :copier, :predicate, | |||
| 2279 | Each SLOT may instead take the form (SNAME SDEFAULT SOPTIONS...), where | 2279 | Each SLOT may instead take the form (SNAME SDEFAULT SOPTIONS...), where |
| 2280 | SDEFAULT is the default value of that slot and SOPTIONS are keyword-value | 2280 | SDEFAULT is the default value of that slot and SOPTIONS are keyword-value |
| 2281 | pairs for that slot. | 2281 | pairs for that slot. |
| 2282 | Currently, only one keyword is supported, `:read-only'. If this has a non-nil | 2282 | Currently, only one keyword is supported, `:read-only'. If this has a |
| 2283 | value, that slot cannot be set via `setf'. | 2283 | non-nil value, that slot cannot be set via `setf'. |
| 2284 | 2284 | ||
| 2285 | \(fn NAME SLOTS...)" | 2285 | \(fn NAME SLOTS...)" |
| 2286 | (declare (doc-string 2) (indent 1) | 2286 | (declare (doc-string 2) (indent 1) |