[Emacs-diffs] trunk r114592: Doc tweaks for cond

[Glenn Morris]

------------------------------------------------------------
revno: 114592
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-09 13:17:20 -0400
message:
  Doc tweaks for cond
  
  * doc/lispref/control.texi (Conditionals): Copyedits.
  
  * src/eval.c (Fcond): Doc tweak.
modified:
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/control.texi       
control.texi-20091113204419-o5vbwnq5f7feedwu-6169
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/eval.c                     eval.c-20091113204419-o5vbwnq5f7feedwu-237

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-10-08 17:49:20 +0000
+++ b/doc/lispref/ChangeLog     2013-10-09 17:17:20 +0000
@@ -1,3 +1,7 @@
+2013-10-09  Glenn Morris  <address@hidden>
+
+       * control.texi (Conditionals): Copyedits.  (Bug#15558)
+
 2013-10-08  Eli Zaretskii  <address@hidden>
 
        Support menus on text-mode terminals.

=== modified file 'doc/lispref/control.texi'
--- a/doc/lispref/control.texi  2013-08-09 22:34:05 +0000
+++ b/doc/lispref/control.texi  2013-10-09 17:17:20 +0000
@@ -218,26 +218,25 @@
 @code{cond} tries the clauses in textual order, by evaluating the
 @var{condition} of each clause.  If the value of @var{condition} is
 address@hidden, the clause ``succeeds''; then @code{cond} evaluates its
address@hidden, and the value of the last of @var{body-forms} becomes
-the value of the @code{cond}.  The remaining clauses are ignored.
address@hidden, and returns the value of the last of @var{body-forms}.
+Any remaining clauses are ignored.
 
 If the value of @var{condition} is @code{nil}, the clause ``fails'', so
-the @code{cond} moves on to the following clause, trying its
address@hidden
+the @code{cond} moves on to the following clause, trying its @var{condition}.
+
+A clause may also look like this:
+
address@hidden
+(@var{condition})
address@hidden example
+
address@hidden
+Then, if @var{condition} is address@hidden when tested, the @code{cond}
+form returns the value of @var{condition}.
 
 If every @var{condition} evaluates to @code{nil}, so that every clause
 fails, @code{cond} returns @code{nil}.
 
-A clause may also look like this:
-
address@hidden
-(@var{condition})
address@hidden example
-
address@hidden
-Then, if @var{condition} is address@hidden when tested, the value of
address@hidden becomes the value of the @code{cond} form.
-
 The following example has four clauses, which test for the cases where
 the value of @code{x} is a number, string, buffer and symbol,
 respectively:

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-09 14:53:13 +0000
+++ b/src/ChangeLog     2013-10-09 17:17:20 +0000
@@ -1,3 +1,7 @@
+2013-10-09  Glenn Morris  <address@hidden>
+
+       * eval.c (Fcond): Doc tweak.
+
 2013-10-09  Eli Zaretskii  <address@hidden>
 
        * xfaces.c (x_free_gc) [HAVE_X_WINDOWS, HAVE_NTGUI]: Don't pass

=== modified file 'src/eval.c'
--- a/src/eval.c        2013-10-03 06:31:06 +0000
+++ b/src/eval.c        2013-10-09 17:17:20 +0000
@@ -1,6 +1,6 @@
 /* Evaluator for GNU Emacs Lisp interpreter.
-   Copyright (C) 1985-1987, 1993-1995, 1999-2013 Free Software
-   Foundation, Inc.
+
+Copyright (C) 1985-1987, 1993-1995, 1999-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -405,9 +405,9 @@
 and, if the value is non-nil, this clause succeeds:
 then the expressions in BODY are evaluated and the last one's
 value is the value of the cond-form.
+If a clause has one element, as in (CONDITION), then the cond-form
+returns CONDITION's value, if that is non-nil.
 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...)  */)
   (Lisp_Object args)
 {