aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/eval.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index eee3ee8237e..3ae42ea87c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-10-09 Glenn Morris <rgm@gnu.org>
2
3 * eval.c (Fcond): Doc tweak.
4
12013-10-09 Eli Zaretskii <eliz@gnu.org> 52013-10-09 Eli Zaretskii <eliz@gnu.org>
2 6
3 * xfaces.c (x_free_gc) [HAVE_X_WINDOWS, HAVE_NTGUI]: Don't pass 7 * xfaces.c (x_free_gc) [HAVE_X_WINDOWS, HAVE_NTGUI]: Don't pass
diff --git a/src/eval.c b/src/eval.c
index 3b4dc9a88d1..1e0a63a0ece 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,6 +1,6 @@
1/* Evaluator for GNU Emacs Lisp interpreter. 1/* Evaluator for GNU Emacs Lisp interpreter.
2 Copyright (C) 1985-1987, 1993-1995, 1999-2013 Free Software 2
3 Foundation, Inc. 3Copyright (C) 1985-1987, 1993-1995, 1999-2013 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
@@ -405,9 +405,9 @@ Each clause looks like (CONDITION BODY...). CONDITION is evaluated
405and, if the value is non-nil, this clause succeeds: 405and, if the value is non-nil, this clause succeeds:
406then the expressions in BODY are evaluated and the last one's 406then the expressions in BODY are evaluated and the last one's
407value is the value of the cond-form. 407value is the value of the cond-form.
408If a clause has one element, as in (CONDITION), then the cond-form
409returns CONDITION's value, if that is non-nil.
408If no clause succeeds, cond returns nil. 410If no clause succeeds, cond returns nil.
409If a clause has one element, as in (CONDITION),
410CONDITION's value if non-nil is returned from the cond-form.
411usage: (cond CLAUSES...) */) 411usage: (cond CLAUSES...) */)
412 (Lisp_Object args) 412 (Lisp_Object args)
413{ 413{