Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.466 emacs/lisp/subr.el:1.467
*** emacs/lisp/subr.el:1.466 Mon Jun 20 21:41:34 2005
--- emacs/lisp/subr.el Tue Jun 21 14:10:34 2005
***************
*** 44,55 ****
(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."
`(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
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."
--- 44,55 ----
(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
! signaled."
`(prog1 ,form
(error "Form marked with `noreturn' did return")))
(defmacro 1value (form)
! "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,67 ****
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.
ARGS should take the same form as an argument list for a `defun'.
DOCSTRING is an optional documentation string.
--- 61,67 ----
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.
ARGS should take the same form as an argument list for a `defun'.
DOCSTRING is an optional documentation string.
***************
*** 347,353 ****
(setq loop (1+ loop))))))
(defvar key-substitution-in-progress nil
! "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.
--- 347,353 ----
(setq loop (1+ loop))))))
(defvar key-substitution-in-progress nil
! "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.
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
