diff options
| author | Juanma Barranquero | 2005-06-21 14:10:34 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2005-06-21 14:10:34 +0000 |
| commit | 265b3f2a04f3ed92bdb4ed27b7c98c29fa0609f4 (patch) | |
| tree | 44b2dd79a3a89ec376b36c9ceca9f829c889a05f | |
| parent | 66bf92744aa757d9c35ffad0a94e2c9024fc9373 (diff) | |
| download | emacs-265b3f2a04f3ed92bdb4ed27b7c98c29fa0609f4.tar.gz emacs-265b3f2a04f3ed92bdb4ed27b7c98c29fa0609f4.zip | |
(1value, lambda, key-substitution-in-progress): Doc fixes.
(noreturn): Fix spellings.
| -rw-r--r-- | lisp/subr.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index f0b8f9e96a7..15c23ebc81b 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -44,12 +44,12 @@ Each element of this list holds the arguments to one call to `defcustom'.") | |||
| 44 | (defmacro noreturn (form) | 44 | (defmacro noreturn (form) |
| 45 | "Evaluates FORM, with the expectation that the evaluation will signal an error | 45 | "Evaluates FORM, with the expectation that the evaluation will signal an error |
| 46 | instead of returning to its caller. If FORM does return, an error is | 46 | instead of returning to its caller. If FORM does return, an error is |
| 47 | signalled." | 47 | signaled." |
| 48 | `(prog1 ,form | 48 | `(prog1 ,form |
| 49 | (error "Form marked with `noreturn' did return"))) | 49 | (error "Form marked with `noreturn' did return"))) |
| 50 | 50 | ||
| 51 | (defmacro 1value (form) | 51 | (defmacro 1value (form) |
| 52 | "Evaluates FORM, with the expectation that all the same value will be returned | 52 | "Evaluates FORM, with the expectation that the same value will be returned |
| 53 | from all evaluations of FORM. This is the global do-nothing | 53 | from all evaluations of FORM. This is the global do-nothing |
| 54 | version of `1value'. There is also `testcover-1value' that | 54 | version of `1value'. There is also `testcover-1value' that |
| 55 | complains if FORM ever does return differing values." | 55 | complains if FORM ever does return differing values." |
| @@ -61,7 +61,7 @@ A call of the form (lambda ARGS DOCSTRING INTERACTIVE BODY) is | |||
| 61 | self-quoting; the result of evaluating the lambda expression is the | 61 | self-quoting; the result of evaluating the lambda expression is the |
| 62 | expression itself. The lambda expression may then be treated as a | 62 | expression itself. The lambda expression may then be treated as a |
| 63 | function, i.e., stored as the function value of a symbol, passed to | 63 | function, i.e., stored as the function value of a symbol, passed to |
| 64 | funcall or mapcar, etc. | 64 | `funcall' or `mapcar', etc. |
| 65 | 65 | ||
| 66 | ARGS should take the same form as an argument list for a `defun'. | 66 | ARGS should take the same form as an argument list for a `defun'. |
| 67 | DOCSTRING is an optional documentation string. | 67 | DOCSTRING is an optional documentation string. |
| @@ -347,7 +347,7 @@ but optional second arg NODIGITS non-nil treats them like other chars." | |||
| 347 | (setq loop (1+ loop)))))) | 347 | (setq loop (1+ loop)))))) |
| 348 | 348 | ||
| 349 | (defvar key-substitution-in-progress nil | 349 | (defvar key-substitution-in-progress nil |
| 350 | "Used internally by substitute-key-definition.") | 350 | "Used internally by `substitute-key-definition'.") |
| 351 | 351 | ||
| 352 | (defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix) | 352 | (defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix) |
| 353 | "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF. | 353 | "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF. |