[Emacs-diffs] Changes to emacs/lispref/control.texi

[Miles Bader]

Index: emacs/lispref/control.texi
diff -c emacs/lispref/control.texi:1.17 emacs/lispref/control.texi:1.18
*** emacs/lispref/control.texi:1.17     Sun May 12 13:04:51 2002
--- emacs/lispref/control.texi  Tue Feb  4 09:47:52 2003
***************
*** 1,7 ****
  @c -*-texinfo-*-
  @c This is part of the GNU Emacs Lisp Reference Manual.
  @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999
! @c  Free Software Foundation, Inc. 
  @c See the file elisp.texi for copying conditions.
  @setfilename ../info/control
  @node Control Structures, Variables, Evaluation, Top
--- 1,7 ----
  @c -*-texinfo-*-
  @c This is part of the GNU Emacs Lisp Reference Manual.
  @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999
! @c  Free Software Foundation, Inc.
  @c See the file elisp.texi for copying conditions.
  @setfilename ../info/control
  @node Control Structures, Variables, Evaluation, Top
***************
*** 154,160 ****
  address@hidden, @var{then-form} is evaluated and the result returned.
  Otherwise, the @var{else-forms} are evaluated in textual order, and the
  value of the last one is returned.  (The @var{else} part of @code{if} is
! an example of an implicit @code{progn}.  @xref{Sequencing}.) 
  
  If @var{condition} has the value @code{nil}, and no @var{else-forms} are
  given, @code{if} returns @code{nil}.
--- 154,160 ----
  address@hidden, @var{then-form} is evaluated and the result returned.
  Otherwise, the @var{else-forms} are evaluated in textual order, and the
  value of the last one is returned.  (The @var{else} part of @code{if} is
! an example of an implicit @code{progn}.  @xref{Sequencing}.)
  
  If @var{condition} has the value @code{nil}, and no @var{else-forms} are
  given, @code{if} returns @code{nil}.
***************
*** 165,172 ****
  
  @example
  @group
! (if nil 
!     (print 'true) 
    'very-false)
  @result{} very-false
  @end group
--- 165,172 ----
  
  @example
  @group
! (if nil
!     (print 'true)
    'very-false)
  @result{} very-false
  @end group
***************
*** 260,266 ****
  never @code{nil}, so this clause never fails, provided the @code{cond}
  gets to it at all.
  
! For example, 
  
  @example
  @group
--- 260,266 ----
  never @code{nil}, so this clause never fails, provided the @code{cond}
  gets to it at all.
  
! For example,
  
  @example
  @group
***************
*** 376,382 ****
  @var{conditions} turned out @code{nil}.  (Think about it; which one
  did not?)
  
! For example, this expression tests whether @code{x} is either 
  @code{nil} or the integer zero:
  
  @example
--- 376,382 ----
  @var{conditions} turned out @code{nil}.  (Think about it; which one
  did not?)
  
! For example, this expression tests whether @code{x} is either
  @code{nil} or the integer zero:
  
  @example
***************
*** 401,407 ****
  @example
  @group
  (if @var{arg1} @var{arg1}
!   (if @var{arg2} @var{arg2} 
      @var{arg3}))
  @end group
  @end example
--- 401,407 ----
  @example
  @group
  (if @var{arg1} @var{arg1}
!   (if @var{arg2} @var{arg2}
      @var{arg3}))
  @end group
  @end example
***************
*** 663,669 ****
  @end group
  
  @group
! (catch 'hack 
    (print (catch2 'hack))
    'no)
  @print{} yes
--- 663,669 ----
  @end group
  
  @group
! (catch 'hack
    (print (catch2 'hack))
    'no)
  @print{} yes
***************
*** 745,751 ****
  buffer.  You can also signal errors explicitly with the functions
  @code{error} and @code{signal}.
  
!   Quitting, which happens when the user types @kbd{C-g}, is not 
  considered an error, but it is handled almost like an error.
  @xref{Quitting}.
  
--- 745,751 ----
  buffer.  You can also signal errors explicitly with the functions
  @code{error} and @code{signal}.
  
!   Quitting, which happens when the user types @kbd{C-g}, is not
  considered an error, but it is handled almost like an error.
  @xref{Quitting}.
  
***************
*** 1000,1008 ****
  @smallexample
  @group
  (defun safe-divide (dividend divisor)
!   (condition-case err                
        ;; @r{Protected form.}
!       (/ dividend divisor)              
  @end group
  @group
      ;; @r{The handler.}
--- 1000,1008 ----
  @smallexample
  @group
  (defun safe-divide (dividend divisor)
!   (condition-case err
        ;; @r{Protected form.}
!       (/ dividend divisor)
  @end group
  @group
      ;; @r{The handler.}
***************
*** 1046,1052 ****
        ;; @r{This is a call to the function @code{error}.}
        (error "Rats!  The variable %s was %s, not 35" 'baz baz))
    ;; @r{This is the handler; it is not a form.}
!   (error (princ (format "The error was: %s" err)) 
           2))
  @print{} The error was: (error "Rats!  The variable baz was 34, not 35")
  @result{} 2
--- 1046,1052 ----
        ;; @r{This is a call to the function @code{error}.}
        (error "Rats!  The variable %s was %s, not 35" 'baz baz))
    ;; @r{This is the handler; it is not a form.}
!   (error (princ (format "The error was: %s" err))
           2))
  @print{} The error was: (error "Rats!  The variable baz was 34, not 35")
  @result{} 2
***************
*** 1096,1102 ****
  @group
  (put 'new-error
       'error-conditions
!      '(error my-own-errors new-error))       
  @result{} (error my-own-errors new-error)
  @end group
  @group
--- 1096,1102 ----
  @group
  (put 'new-error
       'error-conditions
!      '(error my-own-errors new-error))
  @result{} (error my-own-errors new-error)
  @end group
  @group
***************
*** 1112,1118 ****
  
    The error string should start with a capital letter but it should
  not end with a period.  This is for consistency with the rest of Emacs.
!  
    Naturally, Emacs will never signal @code{new-error} on its own; only
  an explicit call to @code{signal} (@pxref{Signaling Errors}) in your
  code can do this:
--- 1112,1118 ----
  
    The error string should start with a capital letter but it should
  not end with a period.  This is for consistency with the rest of Emacs.
! 
    Naturally, Emacs will never signal @code{new-error} on its own; only
  an explicit call to @code{signal} (@pxref{Signaling Errors}) in your
  code can do this: