aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-03-25 03:41:39 +0000
committerGlenn Morris2008-03-25 03:41:39 +0000
commit7b710be149269f34c28e0528ed0eec1c4fe2a1af (patch)
treefee4869b2c9f4b28381a509064ae9f8ca94b3966
parent1cdb4ad71a1c580a34b5256b051ddc34060c7c4e (diff)
downloademacs-7b710be149269f34c28e0528ed0eec1c4fe2a1af.tar.gz
emacs-7b710be149269f34c28e0528ed0eec1c4fe2a1af.zip
(calendar-iso-read-date): New name for calendar-iso-read-args. Update
callers, make old name an obsolete alias.
-rw-r--r--lisp/calendar/cal-iso.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index 2dbe97df2a5..3a5ff0a3d55 100644
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -94,7 +94,7 @@ date Sunday, December 31, 1 BC."
94 (message "ISO date: %s" 94 (message "ISO date: %s"
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-date (&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 99Reads a year and week, and if DAYFLAG is non-nil a day (otherwise
100taken to be 1)." 100taken to be 1)."
@@ -118,10 +118,13 @@ taken to be 1)."
118 1))) 118 1)))
119 (list (list week day year)))) 119 (list (list week day year))))
120 120
121(define-obsolete-function-alias
122 'calendar-iso-read-args 'calendar-iso-read-date "23.1")
123
121;;;###cal-autoload 124;;;###cal-autoload
122(defun calendar-goto-iso-date (date &optional noecho) 125(defun calendar-goto-iso-date (date &optional noecho)
123 "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil." 126 "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil."
124 (interactive (calendar-iso-read-args t)) 127 (interactive (calendar-iso-read-date t))
125 (calendar-goto-date (calendar-gregorian-from-absolute 128 (calendar-goto-date (calendar-gregorian-from-absolute
126 (calendar-absolute-from-iso date))) 129 (calendar-absolute-from-iso date)))
127 (or noecho (calendar-print-iso-date))) 130 (or noecho (calendar-print-iso-date)))
@@ -130,7 +133,7 @@ taken to be 1)."
130(defun calendar-goto-iso-week (date &optional noecho) 133(defun calendar-goto-iso-week (date &optional noecho)
131 "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil. 134 "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil.
132Interactively, goes to the first day of the specified week." 135Interactively, goes to the first day of the specified week."
133 (interactive (calendar-iso-read-args)) 136 (interactive (calendar-iso-read-date))
134 (calendar-goto-date (calendar-gregorian-from-absolute 137 (calendar-goto-date (calendar-gregorian-from-absolute
135 (calendar-absolute-from-iso date))) 138 (calendar-absolute-from-iso date)))
136 (or noecho (calendar-print-iso-date))) 139 (or noecho (calendar-print-iso-date)))