summaryrefslogtreecommitdiff
path: root/lisp/subr.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2005-06-21 14:10:34 +0000
committerJuanma Barranquero <lekktu@gmail.com>2005-06-21 14:10:34 +0000
commit265b3f2a04f3ed92bdb4ed27b7c98c29fa0609f4 (patch)
tree44b2dd79a3a89ec376b36c9ceca9f829c889a05f /lisp/subr.el
parent66bf92744aa757d9c35ffad0a94e2c9024fc9373 (diff)
downloademacs-265b3f2a04f3ed92bdb4ed27b7c98c29fa0609f4.tar.gz
(1value, lambda, key-substitution-in-progress): Doc fixes.
(noreturn): Fix spellings.
Diffstat (limited to 'lisp/subr.el')
-rw-r--r--lisp/subr.el8
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'.")
(defmacro noreturn (form)
"Evaluates FORM, with the expectation that the evaluation will signal an error
instead of returning to its caller. If FORM does return, an error is
-signalled."
+signaled."
`(prog1 ,form
(error "Form marked with `noreturn' did return")))
(defmacro 1value (form)
- "Evaluates FORM, with the expectation that all the same value will be returned
+ "Evaluates FORM, with the expectation that the same value will be returned
from all evaluations of FORM. This is the global do-nothing
version of `1value'. There is also `testcover-1value' that
complains if FORM ever does return differing values."
@@ -61,7 +61,7 @@ A call of the form (lambda ARGS DOCSTRING INTERACTIVE BODY) is
self-quoting; the result of evaluating the lambda expression is the
expression itself. The lambda expression may then be treated as a
function, i.e., stored as the function value of a symbol, passed to
-funcall or mapcar, etc.
+`funcall' or `mapcar', etc.
ARGS should take the same form as an argument list for a `defun'.
DOCSTRING is an optional documentation string.
@@ -347,7 +347,7 @@ but optional second arg NODIGITS non-nil treats them like other chars."
(setq loop (1+ loop))))))
(defvar key-substitution-in-progress nil
- "Used internally by substitute-key-definition.")
+ "Used internally by `substitute-key-definition'.")
(defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix)
"Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF.