aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-03-08 20:02:25 +0000
committerGlenn Morris2008-03-08 20:02:25 +0000
commit46d69a521ad389ffb333e022fae6bfbf4f2c7c4a (patch)
tree0be8d3ab8bcc5d5067c8dc6977701d5749dbfe80
parent734254f926d72483065ae5eca6d9358aa3c45362 (diff)
downloademacs-46d69a521ad389ffb333e022fae6bfbf4f2c7c4a.tar.gz
emacs-46d69a521ad389ffb333e022fae6bfbf4f2c7c4a.zip
(calendar-iso-read-args): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/calendar/cal-iso.el4
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8dbd4b2caf..ed65a893f3a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -26,6 +26,8 @@
26 26
27 * calendar/cal-coptic.el (coptic-name): Add doc string. 27 * calendar/cal-coptic.el (coptic-name): Add doc string.
28 28
29 * calendar/cal-iso.el (calendar-iso-read-args): Doc fix.
30
29 * calendar/cal-persia.el (persian-calendar-month-name-array) 31 * calendar/cal-persia.el (persian-calendar-month-name-array)
30 (persian-calendar-epoch): Make constants. 32 (persian-calendar-epoch): Make constants.
31 33
diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index 9df35d5f40a..2a12dd66c04 100644
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -95,7 +95,9 @@ Defaults to today's date if DATE is not given."
95 (calendar-iso-date-string (calendar-cursor-to-date t)))) 95 (calendar-iso-date-string (calendar-cursor-to-date t))))
96 96
97(defun calendar-iso-read-args (&optional dayflag) 97(defun calendar-iso-read-args (&optional dayflag)
98 "Interactively read the arguments for an iso date command." 98 "Interactively read the arguments for an iso date command.
99Reads a year and week, and if DAYFLAG is non-nil a day (otherwise
100taken to be 1)."
99 (let* ((today (calendar-current-date)) 101 (let* ((today (calendar-current-date))
100 (year (calendar-read 102 (year (calendar-read
101 "ISO calendar year (>0): " 103 "ISO calendar year (>0): "