[Emacs-diffs] Changes to emacs/src/eval.c

[Stefan Monnier]

Index: emacs/src/eval.c
diff -c emacs/src/eval.c:1.176 emacs/src/eval.c:1.177
*** emacs/src/eval.c:1.176      Mon Nov 26 18:29:48 2001
--- emacs/src/eval.c    Tue Dec  4 20:39:21 2001
***************
*** 286,292 ****
         doc: /* Eval args until one of them yields non-nil, then return that 
value.
  The remaining args are not evalled at all.
  If all args return nil, return nil.
! usage: (or CONDITIONS ...)  */)
       (args)
       Lisp_Object args;
  {
--- 286,292 ----
         doc: /* Eval args until one of them yields non-nil, then return that 
value.
  The remaining args are not evalled at all.
  If all args return nil, return nil.
! usage: (or &rest CONDITIONS)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 317,323 ****
         doc: /* Eval args until one of them yields nil, then return nil.
  The remaining args are not evalled at all.
  If no arg yields nil, return the last arg's value.
! usage: (and CONDITIONS ...)  */)
       (args)
       Lisp_Object args;
  {
--- 317,323 ----
         doc: /* Eval args until one of them yields nil, then return nil.
  The remaining args are not evalled at all.
  If no arg yields nil, return the last arg's value.
! usage: (and &rest CONDITIONS)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 349,355 ****
  Returns the value of THEN or the value of the last of the ELSE's.
  THEN must be one expression, but ELSE... can be zero or more expressions.
  If COND yields nil, and there are no ELSE's, the value is nil.
! usage: (if COND THEN ELSE...)  */)
       (args)
       Lisp_Object args;
  {
--- 349,355 ----
  Returns the value of THEN or the value of the last of the ELSE's.
  THEN must be one expression, but ELSE... can be zero or more expressions.
  If COND yields nil, and there are no ELSE's, the value is nil.
! usage: (if COND THEN &rest ELSE)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 374,380 ****
  If no clause succeeds, cond returns nil.
  If a clause has one element, as in (CONDITION),
  CONDITION's value if non-nil is returned from the cond-form.
! usage: (cond CLAUSES...)  */)
       (args)
       Lisp_Object args;
  {
--- 374,380 ----
  If no clause succeeds, cond returns nil.
  If a clause has one element, as in (CONDITION),
  CONDITION's value if non-nil is returned from the cond-form.
! usage: (cond &rest CLAUSES)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 402,408 ****
  
  DEFUN ("progn", Fprogn, Sprogn, 0, UNEVALLED, 0,
         doc: /* Eval BODY forms sequentially and return value of last one.
! usage: (progn BODY ...)  */)
       (args)
       Lisp_Object args;
  {
--- 402,408 ----
  
  DEFUN ("progn", Fprogn, Sprogn, 0, UNEVALLED, 0,
         doc: /* Eval BODY forms sequentially and return value of last one.
! usage: (progn &rest BODY)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 443,449 ****
         doc: /* Eval FIRST and BODY sequentially; value from FIRST.
  The value of FIRST is saved during the evaluation of the remaining args,
  whose values are discarded.
! usage: (prog1 FIRST BODY...)  */)
       (args)
       Lisp_Object args;
  {
--- 443,449 ----
         doc: /* Eval FIRST and BODY sequentially; value from FIRST.
  The value of FIRST is saved during the evaluation of the remaining args,
  whose values are discarded.
! usage: (prog1 FIRST &rest BODY)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 477,483 ****
         doc: /* Eval X, Y and BODY sequentially; value from Y.
  The value of Y is saved during the evaluation of the remaining args,
  whose values are discarded.
! usage: (prog2 X Y BODY...)  */)
       (args)
       Lisp_Object args;
  {
--- 477,483 ----
         doc: /* Eval X, Y and BODY sequentially; value from Y.
  The value of Y is saved during the evaluation of the remaining args,
  whose values are discarded.
! usage: (prog2 X Y &rest BODY)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 637,643 ****
         doc: /* Define NAME as a function.
  The definition is (lambda ARGLIST [DOCSTRING] BODY...).
  See also the function `interactive'.
! usage: (defun NAME ARGLIST [DOCSTRING] BODY...)  */)
       (args)
       Lisp_Object args;
  {
--- 637,643 ----
         doc: /* Define NAME as a function.
  The definition is (lambda ARGLIST [DOCSTRING] BODY...).
  See also the function `interactive'.
! usage: (defun NAME ARGLIST &optional DOCSTRING &rest BODY)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 660,666 ****
  the function (lambda ARGLIST BODY...) is applied to
  the list ARGS... as it appears in the expression,
  and the result should be a form to be evaluated instead of the original.
! usage: (defmacro NAME ARGLIST [DOCSTRING] BODY...)  */)
       (args)
       Lisp_Object args;
  {
--- 660,666 ----
  the function (lambda ARGLIST BODY...) is applied to
  the list ARGS... as it appears in the expression,
  and the result should be a form to be evaluated instead of the original.
! usage: (defmacro NAME ARGLIST &optional DOCSTRING &rest BODY)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 760,766 ****
  If SYMBOL is buffer-local, its default value is what is set;
   buffer-local values are not affected.
  DOCSTRING is optional.
! usage: (defconst SYMBOL INITVALUE [DOCSTRING])  */)
       (args)
       Lisp_Object args;
  {
--- 760,766 ----
  If SYMBOL is buffer-local, its default value is what is set;
   buffer-local values are not affected.
  DOCSTRING is optional.
! usage: (defconst SYMBOL INITVALUE &optional DOCSTRING)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 826,832 ****
  Each element of VARLIST is a symbol (which is bound to nil)
  or a list (SYMBOL VALUEFORM) (which binds SYMBOL to the value of VALUEFORM).
  Each VALUEFORM can refer to the symbols already bound by this VARLIST.
! usage: (let* VARLIST BODY...)  */)
       (args)
       Lisp_Object args;
  {
--- 826,832 ----
  Each element of VARLIST is a symbol (which is bound to nil)
  or a list (SYMBOL VALUEFORM) (which binds SYMBOL to the value of VALUEFORM).
  Each VALUEFORM can refer to the symbols already bound by this VARLIST.
! usage: (let* VARLIST &rest BODY)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 865,871 ****
  Each element of VARLIST is a symbol (which is bound to nil)
  or a list (SYMBOL VALUEFORM) (which binds SYMBOL to the value of VALUEFORM).
  All the VALUEFORMs are evalled before any symbols are bound.
! usage: (let VARLIST BODY...)  */)
       (args)
       Lisp_Object args;
  {
--- 865,871 ----
  Each element of VARLIST is a symbol (which is bound to nil)
  or a list (SYMBOL VALUEFORM) (which binds SYMBOL to the value of VALUEFORM).
  All the VALUEFORMs are evalled before any symbols are bound.
! usage: (let VARLIST &rest BODY)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 921,927 ****
         doc: /* If TEST yields non-nil, eval BODY... and repeat.
  The order of execution is thus TEST, BODY, TEST, BODY and so on
  until TEST returns nil.
! usage: (while TEST BODY...)  */)
       (args)
       Lisp_Object args;
  {
--- 921,927 ----
         doc: /* If TEST yields non-nil, eval BODY... and repeat.
  The order of execution is thus TEST, BODY, TEST, BODY and so on
  until TEST returns nil.
! usage: (while TEST &rest BODY)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 1030,1036 ****
  Within BODY, (throw TAG) with same tag exits BODY and exits this `catch'.
  If no throw happens, `catch' returns the value of the last BODY form.
  If a throw happens, it specifies the value to return from `catch'.
! usage: (catch TAG BODY...)  */)
       (args)
       Lisp_Object args;
  {
--- 1030,1036 ----
  Within BODY, (throw TAG) with same tag exits BODY and exits this `catch'.
  If no throw happens, `catch' returns the value of the last BODY form.
  If a throw happens, it specifies the value to return from `catch'.
! usage: (catch TAG &rest BODY)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 1159,1165 ****
  If BODYFORM completes normally, its value is returned
  after executing the UNWINDFORMS.
  If BODYFORM exits nonlocally, the UNWINDFORMS are executed anyway.
! usage: (unwind-protect BODYFORM UNWINDFORMS...)  */)
       (args)
       Lisp_Object args;
  {
--- 1159,1165 ----
  If BODYFORM completes normally, its value is returned
  after executing the UNWINDFORMS.
  If BODYFORM exits nonlocally, the UNWINDFORMS are executed anyway.
! usage: (unwind-protect BODYFORM &rest UNWINDFORMS)  */)
       (args)
       Lisp_Object args;
  {
***************
*** 1199,1205 ****
  
  The value of the last BODY form is returned from the condition-case.
  See also the function `signal' for more info.
! usage: (condition-case VAR BODYFORM HANDLERS...)  */)
       (args)
       Lisp_Object args;
  {
--- 1199,1205 ----
  
  The value of the last BODY form is returned from the condition-case.
  See also the function `signal' for more info.
! usage: (condition-case VAR BODYFORM &rest HANDLERS)  */)
       (args)
       Lisp_Object args;
  {