aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-07-14 11:11:43 +0000
committerJuanma Barranquero2007-07-14 11:11:43 +0000
commitebc3ae141e844a7fe108b4e7d019a45c0f581429 (patch)
treecc766089d4a9cf337a7a442fafaa845429c50b7d
parent1bab435a3e51e7a8442847679cb9daf68bf4f264 (diff)
downloademacs-ebc3ae141e844a7fe108b4e7d019a45c0f581429.tar.gz
emacs-ebc3ae141e844a7fe108b4e7d019a45c0f581429.zip
(when, unless): Doc fix.
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/subr.el4
2 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f550312912..d4133f6fae2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-07-14 Juanma Barranquero <lekktu@gmail.com>
2
3 * subr.el (when, unless): Doc fix.
4
12007-07-13 Eli Zaretskii <eliz@gnu.org> 52007-07-13 Eli Zaretskii <eliz@gnu.org>
2 6
3 * makefile.w32-in (install-lisp-SH, install-lisp-CMD): New targets. 7 * makefile.w32-in (install-lisp-SH, install-lisp-CMD): New targets.
@@ -25,8 +29,7 @@
252007-07-13 Carsten Dominik <dominik@science.uva.nl> 292007-07-13 Carsten Dominik <dominik@science.uva.nl>
26 30
27 * textmodes/org.el: Bug fixes. 31 * textmodes/org.el: Bug fixes.
28 (org-end-of-line): Move to end of line if in headline without 32 (org-end-of-line): Move to end of line if in headline without tags.
29 tags.
30 33
312007-07-13 Stefan Monnier <monnier@iro.umontreal.ca> 342007-07-13 Stefan Monnier <monnier@iro.umontreal.ca>
32 35
@@ -297,7 +300,7 @@
297 (math-approx-gamma-const): Add docstrings. 300 (math-approx-gamma-const): Add docstrings.
298 301
299 * calc/calc-forms.el (math-julian-date-beginning) 302 * calc/calc-forms.el (math-julian-date-beginning)
300 (math-julian-date-beginning-int) New constants. 303 (math-julian-date-beginning-int): New constants.
301 (math-format-date-part, math-parse-standard-date, calcFunc-julian): 304 (math-format-date-part, math-parse-standard-date, calcFunc-julian):
302 Use the new constants. 305 Use the new constants.
303 306
diff --git a/lisp/subr.el b/lisp/subr.el
index 185b9031d27..c4816f5d134 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -103,7 +103,7 @@ change the list."
103When COND yields non-nil, eval BODY forms sequentially and return 103When COND yields non-nil, eval BODY forms sequentially and return
104value of last one, or nil if there are none. 104value of last one, or nil if there are none.
105 105
106\(fn COND BODY ...)" 106\(fn COND BODY...)"
107 (declare (indent 1) (debug t)) 107 (declare (indent 1) (debug t))
108 (list 'if cond (cons 'progn body))) 108 (list 'if cond (cons 'progn body)))
109 109
@@ -112,7 +112,7 @@ value of last one, or nil if there are none.
112When COND yields nil, eval BODY forms sequentially and return 112When COND yields nil, eval BODY forms sequentially and return
113value of last one, or nil if there are none. 113value of last one, or nil if there are none.
114 114
115\(fn COND BODY ...)" 115\(fn COND BODY...)"
116 (declare (indent 1) (debug t)) 116 (declare (indent 1) (debug t))
117 (cons 'if (cons cond (cons nil body)))) 117 (cons 'if (cons cond (cons nil body))))
118 118