aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-10-05 19:02:04 -0700
committerGlenn Morris2014-10-05 19:02:04 -0700
commit3f65970414538063e38ada2a47cb4ef4f35b630e (patch)
treef1d52bbf2a03d3cf54a36c889bd974f96f102a31
parent918b5def3f68a99dfd6474afa20c56ab0df3fd09 (diff)
downloademacs-3f65970414538063e38ada2a47cb4ef4f35b630e.tar.gz
emacs-3f65970414538063e38ada2a47cb4ef4f35b630e.zip
Remove calendar code obsolete since at least version 23.1
* lisp/calendar/cal-bahai.el (calendar-absolute-from-bahai) (calendar-print-bahai-date, calendar-bahai-prompt-for-date) (calendar-goto-bahai-date, list-bahai-diary-entries) (mark-bahai-calendar-date-pattern, mark-bahai-diary-entries) (insert-bahai-diary-entry, insert-monthly-bahai-diary-entry) (insert-yearly-bahai-diary-entry): * lisp/calendar/cal-china.el (chinese-calendar-time-zone) (chinese-calendar-location-name) (chinese-calendar-daylight-time-offset) (chinese-calendar-standard-time-zone-name) (chinese-calendar-daylight-time-zone-name) (chinese-calendar-daylight-savings-starts) (chinese-calendar-daylight-savings-ends) (chinese-calendar-daylight-savings-starts-time) (chinese-calendar-daylight-savings-ends-time) (chinese-calendar-celestial-stem) (chinese-calendar-terrestrial-branch) (calendar-absolute-from-chinese, calendar-print-chinese-date) (calendar-goto-chinese-date): * lisp/calendar/cal-coptic.el (calendar-absolute-from-coptic) (calendar-print-coptic-date, coptic-prompt-for-date) (calendar-goto-coptic-date, calendar-absolute-from-ethiopic) (calendar-print-ethiopic-date, calendar-goto-ethiopic-date): * lisp/calendar/cal-french.el (calendar-absolute-from-french) (calendar-print-french-date, calendar-goto-french-date): * lisp/calendar/cal-hebrew.el (diary-sabbath-candles-minutes) (calendar-absolute-from-hebrew, calendar-print-hebrew-date) (hebrew-calendar-yahrzeit, calendar-goto-hebrew-date) (holiday-rosh-hashanah-etc, holiday-hanukkah) (holiday-passover-etc, holiday-tisha-b-av-etc) (list-hebrew-diary-entries, mark-hebrew-calendar-date-pattern) (mark-hebrew-diary-entries, insert-hebrew-diary-entry) (insert-monthly-hebrew-diary-entry) (insert-yearly-hebrew-diary-entry, list-yahrzeit-dates) (diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha) (diary-sabbath-candles): * lisp/calendar/cal-islam.el (calendar-absolute-from-islamic) (calendar-print-islamic-date, calendar-goto-islamic-date) (list-islamic-diary-entries, mark-islamic-calendar-date-pattern) (mark-islamic-diary-entries, insert-islamic-diary-entry) (insert-monthly-islamic-diary-entry) (insert-yearly-islamic-diary-entry): * lisp/calendar/cal-iso.el (calendar-absolute-from-iso) (calendar-print-iso-date, calendar-iso-read-args) (calendar-goto-iso-date, calendar-goto-iso-week): * lisp/calendar/cal-julian.el (calendar-absolute-from-julian) (calendar-print-julian-date, calendar-goto-julian-date) (calendar-absolute-from-astro, calendar-print-astro-day-number) (calendar-goto-astro-day-number): * lisp/calendar/cal-mayan.el (calendar-print-mayan-date) (calendar-next-haab-date, calendar-previous-haab-date) (calendar-next-tzolkin-date, calendar-previous-tzolkin-date) (calendar-next-calendar-round-date) (calendar-previous-calendar-round-date) (calendar-absolute-from-mayan-long-count) (calendar-goto-mayan-long-count-date): * lisp/calendar/cal-move.el (scroll-calendar-left) (scroll-calendar-right, scroll-calendar-left-three-months) (scroll-calendar-right-three-months): * lisp/calendar/cal-persia.el (calendar-absolute-from-persian) (calendar-print-persian-date, persian-prompt-for-date) (calendar-goto-persian-date): * lisp/calendar/cal-x.el (calendar-after-frame-setup-hooks): * lisp/calendar/calendar.el (view-diary-entries-initially) (mark-diary-entries-in-calendar, calendar-today-face) (diary-face, holiday-face, view-calendar-holidays-initially) (mark-holidays-in-calendar, initial-calendar-window-hook) (today-visible-calendar-hook, today-invisible-calendar-hook) (hebrew-diary-entry-symbol, islamic-diary-entry-symbol) (bahai-diary-entry-symbol, american-date-diary-pattern) (european-date-diary-pattern, european-calendar-display-form) (american-calendar-display-form, holidays-in-diary-buffer) (all-hebrew-calendar-holidays, all-christian-calendar-holidays) (all-islamic-calendar-holidays, all-bahai-calendar-holidays) (fancy-diary-buffer, increment-calendar-month) (extract-calendar-month, extract-calendar-day) (extract-calendar-year, exit-calendar, calendar-date-is-legal-p) (mark-visible-calendar-date, calendar-version): * lisp/calendar/diary-lib.el (diary-button-face, sexp-diary-entry-symbol) (diary-display-hook, list-diary-entries-hook) (mark-diary-entries-hook, nongregorian-diary-listing-hook) (nongregorian-diary-marking-hook, print-diary-entries-hook) (abbreviated-calendar-year, number-of-diary-entries) (view-other-diary-entries, add-to-diary-list) (include-other-diary-files, simple-diary-display) (fancy-diary-display, print-diary-entries, mark-diary-entries) (mark-sexp-diary-entries, mark-included-diary-files) (mark-calendar-days-named, mark-calendar-month) (mark-calendar-date-pattern, sort-diary-entries) (list-sexp-diary-entries, make-diary-entry, insert-diary-entry) (insert-weekly-diary-entry, insert-monthly-diary-entry) (insert-yearly-diary-entry, insert-anniversary-diary-entry) (insert-block-diary-entry, insert-cyclic-diary-entry) (fancy-diary-font-lock-keywords, fancy-diary-display-mode): * lisp/calendar/holidays.el (general-holidays, oriental-holidays) (local-holidays, other-holidays, hebrew-holidays) (christian-holidays, islamic-holidays, bahai-holidays) (solar-holidays, list-calendar-holidays) (check-calendar-holidays, mark-calendar-holidays) (filter-visible-calendar-holidays): * lisp/calendar/lunar.el (calendar-phases-of-moon, phases-of-moon) (diary-phases-of-moon): Remove obsolete aliases. * lisp/calendar/cal-menu.el (cal-menu-load-hook): Remove obsolete hook. * calendar/cal-x.el (calendar-one-frame-setup) (calendar-only-one-frame-setup, calendar-two-frame-setup): Remove obsolete functions. (cal-x-load-hook): Remove obsolete hook. * calendar/calendar.el (european-calendar-style): Remove obsolete variable. (calendar-date-style): No longer consult european-calendar-style. * calendar/calendar.el (european-calendar, american-calendar): Remove obsolete commands. * calendar/calendar.el (calendar-for-loop): Remove obsolete macro. * calendar/diary-lib.el (diary-face): Remove obsolete variable. (diary-font-lock-date-forms, diary-fancy-font-lock-keywords): Use the face `diary' instead of the variable `diary-face'. * calendar/holidays.el (hebrew-holidays-1, hebrew-holidays-2) (hebrew-holidays-3, hebrew-holidays-4): Remove obsolete variables. * lisp/calendar/icalendar.el (icalendar--date-style): Remove function. Replace all uses with calendar-date-style. * lisp/textmodes/remember.el (calendar-date-style): Declare. (remember-diary-convert-entry): No longer consult european-calendar-style. * test/automated/icalendar-tests.el (icalendar--calendar-style): Remove test, no longer relevant.
Diffstat
-rw-r--r--etc/NEWS21
-rw-r--r--lisp/ChangeLog127
-rw-r--r--lisp/calendar/cal-bahai.el32
-rw-r--r--lisp/calendar/cal-china.el42
-rw-r--r--lisp/calendar/cal-coptic.el20
-rw-r--r--lisp/calendar/cal-french.el13
-rw-r--r--lisp/calendar/cal-hebrew.el70
-rw-r--r--lisp/calendar/cal-islam.el26
-rw-r--r--lisp/calendar/cal-iso.el15
-rw-r--r--lisp/calendar/cal-julian.el17
-rw-r--r--lisp/calendar/cal-mayan.el27
-rw-r--r--lisp/calendar/cal-menu.el8
-rw-r--r--lisp/calendar/cal-move.el12
-rw-r--r--lisp/calendar/cal-persia.el11
-rw-r--r--lisp/calendar/cal-x.el33
-rw-r--r--lisp/calendar/calendar.el135
-rw-r--r--lisp/calendar/diary-lib.el117
-rw-r--r--lisp/calendar/holidays.el138
-rw-r--r--lisp/calendar/icalendar.el34
-rw-r--r--lisp/calendar/lunar.el14
-rw-r--r--lisp/textmodes/remember.el26
-rw-r--r--test/ChangeLog5
-rw-r--r--test/automated/icalendar-tests.el12
23 files changed, 181 insertions, 774 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 47b25e614d0..1e8572ee888 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -143,11 +143,26 @@ appending FUN to `minibuffer-setup-hook'.
143`diary-chinese-insert-monthly-entry', `diary-chinese-insert-yearly-entry'. 143`diary-chinese-insert-monthly-entry', `diary-chinese-insert-yearly-entry'.
144 144
145+++ 145+++
146*** Calendar can list and mark diary entries with Chinese dates. 146*** The calendar can now list and mark diary entries with Chinese dates.
147See `diary-chinese-list-entries' and `diary-chinese-mark-entries'. 147See `diary-chinese-list-entries' and `diary-chinese-mark-entries'.
148 148
149*** The mode line of the calendar buffer will not be modified if 149---
150`calendar-mode-line-format' is nil. 150*** The option `calendar-mode-line-format' can now be nil,
151which means to do nothing special with the mode line in calendars.
152
153---
154*** Many items obsolete since at least version 23.1 have been removed.
155The majority were function/variable/face aliases, too numerous to list here.
156The remainder were:
157
158**** Functions `calendar-one-frame-setup', `calendar-only-one-frame-setup',
159`calendar-two-frame-setup', `european-calendar', `american-calendar'.
160
161**** Hooks `cal-menu-load-hook', `cal-x-load-hook'.
162
163**** Macro `calendar-for-loop'.
164
165**** Variables `european-calendar-style', `diary-face', `hebrew-holidays-{1,4}'.
151 166
152** New ERT function `ert-summarize-tests-batch-and-exit'. 167** New ERT function `ert-summarize-tests-batch-and-exit'.
153 168
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 039387ed4af..a04e6d2b91d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,130 @@
12014-10-06 Glenn Morris <rgm@gnu.org>
2
3 Remove calendar code obsolete since at least version 23.1.
4 * calendar/cal-bahai.el (calendar-absolute-from-bahai)
5 (calendar-print-bahai-date, calendar-bahai-prompt-for-date)
6 (calendar-goto-bahai-date, list-bahai-diary-entries)
7 (mark-bahai-calendar-date-pattern, mark-bahai-diary-entries)
8 (insert-bahai-diary-entry, insert-monthly-bahai-diary-entry)
9 (insert-yearly-bahai-diary-entry):
10 * calendar/cal-china.el (chinese-calendar-time-zone)
11 (chinese-calendar-location-name)
12 (chinese-calendar-daylight-time-offset)
13 (chinese-calendar-standard-time-zone-name)
14 (chinese-calendar-daylight-time-zone-name)
15 (chinese-calendar-daylight-savings-starts)
16 (chinese-calendar-daylight-savings-ends)
17 (chinese-calendar-daylight-savings-starts-time)
18 (chinese-calendar-daylight-savings-ends-time)
19 (chinese-calendar-celestial-stem)
20 (chinese-calendar-terrestrial-branch)
21 (calendar-absolute-from-chinese, calendar-print-chinese-date)
22 (calendar-goto-chinese-date):
23 * calendar/cal-coptic.el (calendar-absolute-from-coptic)
24 (calendar-print-coptic-date, coptic-prompt-for-date)
25 (calendar-goto-coptic-date, calendar-absolute-from-ethiopic)
26 (calendar-print-ethiopic-date, calendar-goto-ethiopic-date):
27 * calendar/cal-french.el (calendar-absolute-from-french)
28 (calendar-print-french-date, calendar-goto-french-date):
29 * calendar/cal-hebrew.el (diary-sabbath-candles-minutes)
30 (calendar-absolute-from-hebrew, calendar-print-hebrew-date)
31 (hebrew-calendar-yahrzeit, calendar-goto-hebrew-date)
32 (holiday-rosh-hashanah-etc, holiday-hanukkah)
33 (holiday-passover-etc, holiday-tisha-b-av-etc)
34 (list-hebrew-diary-entries, mark-hebrew-calendar-date-pattern)
35 (mark-hebrew-diary-entries, insert-hebrew-diary-entry)
36 (insert-monthly-hebrew-diary-entry)
37 (insert-yearly-hebrew-diary-entry, list-yahrzeit-dates)
38 (diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha)
39 (diary-sabbath-candles):
40 * calendar/cal-islam.el (calendar-absolute-from-islamic)
41 (calendar-print-islamic-date, calendar-goto-islamic-date)
42 (list-islamic-diary-entries, mark-islamic-calendar-date-pattern)
43 (mark-islamic-diary-entries, insert-islamic-diary-entry)
44 (insert-monthly-islamic-diary-entry)
45 (insert-yearly-islamic-diary-entry):
46 * calendar/cal-iso.el (calendar-absolute-from-iso)
47 (calendar-print-iso-date, calendar-iso-read-args)
48 (calendar-goto-iso-date, calendar-goto-iso-week):
49 * calendar/cal-julian.el (calendar-absolute-from-julian)
50 (calendar-print-julian-date, calendar-goto-julian-date)
51 (calendar-absolute-from-astro, calendar-print-astro-day-number)
52 (calendar-goto-astro-day-number):
53 * calendar/cal-mayan.el (calendar-print-mayan-date)
54 (calendar-next-haab-date, calendar-previous-haab-date)
55 (calendar-next-tzolkin-date, calendar-previous-tzolkin-date)
56 (calendar-next-calendar-round-date)
57 (calendar-previous-calendar-round-date)
58 (calendar-absolute-from-mayan-long-count)
59 (calendar-goto-mayan-long-count-date):
60 * calendar/cal-move.el (scroll-calendar-left)
61 (scroll-calendar-right, scroll-calendar-left-three-months)
62 (scroll-calendar-right-three-months):
63 * calendar/cal-persia.el (calendar-absolute-from-persian)
64 (calendar-print-persian-date, persian-prompt-for-date)
65 (calendar-goto-persian-date):
66 * calendar/cal-x.el (calendar-after-frame-setup-hooks):
67 * calendar/calendar.el (view-diary-entries-initially)
68 (mark-diary-entries-in-calendar, calendar-today-face)
69 (diary-face, holiday-face, view-calendar-holidays-initially)
70 (mark-holidays-in-calendar, initial-calendar-window-hook)
71 (today-visible-calendar-hook, today-invisible-calendar-hook)
72 (hebrew-diary-entry-symbol, islamic-diary-entry-symbol)
73 (bahai-diary-entry-symbol, american-date-diary-pattern)
74 (european-date-diary-pattern, european-calendar-display-form)
75 (american-calendar-display-form, holidays-in-diary-buffer)
76 (all-hebrew-calendar-holidays, all-christian-calendar-holidays)
77 (all-islamic-calendar-holidays, all-bahai-calendar-holidays)
78 (fancy-diary-buffer, increment-calendar-month)
79 (extract-calendar-month, extract-calendar-day)
80 (extract-calendar-year, exit-calendar, calendar-date-is-legal-p)
81 (mark-visible-calendar-date, calendar-version):
82 * calendar/diary-lib.el (diary-button-face, sexp-diary-entry-symbol)
83 (diary-display-hook, list-diary-entries-hook)
84 (mark-diary-entries-hook, nongregorian-diary-listing-hook)
85 (nongregorian-diary-marking-hook, print-diary-entries-hook)
86 (abbreviated-calendar-year, number-of-diary-entries)
87 (view-other-diary-entries, add-to-diary-list)
88 (include-other-diary-files, simple-diary-display)
89 (fancy-diary-display, print-diary-entries, mark-diary-entries)
90 (mark-sexp-diary-entries, mark-included-diary-files)
91 (mark-calendar-days-named, mark-calendar-month)
92 (mark-calendar-date-pattern, sort-diary-entries)
93 (list-sexp-diary-entries, make-diary-entry, insert-diary-entry)
94 (insert-weekly-diary-entry, insert-monthly-diary-entry)
95 (insert-yearly-diary-entry, insert-anniversary-diary-entry)
96 (insert-block-diary-entry, insert-cyclic-diary-entry)
97 (fancy-diary-font-lock-keywords, fancy-diary-display-mode):
98 * calendar/holidays.el (general-holidays, oriental-holidays)
99 (local-holidays, other-holidays, hebrew-holidays)
100 (christian-holidays, islamic-holidays, bahai-holidays)
101 (solar-holidays, list-calendar-holidays)
102 (check-calendar-holidays, mark-calendar-holidays)
103 (filter-visible-calendar-holidays):
104 * calendar/lunar.el (calendar-phases-of-moon, phases-of-moon)
105 (diary-phases-of-moon): Remove obsolete aliases.
106 * calendar/cal-menu.el (cal-menu-load-hook): Remove obsolete hook.
107 * calendar/cal-x.el (calendar-one-frame-setup)
108 (calendar-only-one-frame-setup, calendar-two-frame-setup):
109 Remove obsolete functions.
110 (cal-x-load-hook): Remove obsolete hook.
111 * calendar/calendar.el (european-calendar-style):
112 Remove obsolete variable.
113 (calendar-date-style): No longer consult european-calendar-style.
114 * calendar/calendar.el (european-calendar, american-calendar):
115 Remove obsolete commands.
116 * calendar/calendar.el (calendar-for-loop): Remove obsolete macro.
117 * calendar/diary-lib.el (diary-face): Remove obsolete variable.
118 (diary-font-lock-date-forms, diary-fancy-font-lock-keywords):
119 Use the face `diary' instead of the variable `diary-face'.
120 * calendar/holidays.el (hebrew-holidays-1, hebrew-holidays-2)
121 (hebrew-holidays-3, hebrew-holidays-4): Remove obsolete variables.
122 * calendar/icalendar.el (icalendar--date-style): Remove function.
123 Replace all uses with calendar-date-style.
124 * textmodes/remember.el (calendar-date-style): Declare.
125 (remember-diary-convert-entry):
126 No longer consult european-calendar-style.
127
12014-10-05 Leo Liu <sdl.web@gmail.com> 1282014-10-05 Leo Liu <sdl.web@gmail.com>
2 129
3 * imenu.el (imenu-default-goto-function): Fix typo. 130 * imenu.el (imenu-default-goto-function): Fix typo.
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index f7723b9aa7b..8e828074ea4 100644
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -94,9 +94,6 @@ Gregorian date Sunday, December 31, 1 BC."
94 0) 94 0)
95 day))) ; days so far this month 95 day))) ; days so far this month
96 96
97(define-obsolete-function-alias 'calendar-absolute-from-bahai
98 'calendar-bahai-to-absolute "23.1")
99
100(defun calendar-bahai-from-absolute (date) 97(defun calendar-bahai-from-absolute (date)
101 "Bahá'í date (month day year) corresponding to the absolute DATE." 98 "Bahá'í date (month day year) corresponding to the absolute DATE."
102 (if (< date calendar-bahai-epoch) 99 (if (< date calendar-bahai-epoch)
@@ -152,9 +149,6 @@ Defaults to today's date if DATE is not given."
152 (message "Date is pre-Bahá'í") 149 (message "Date is pre-Bahá'í")
153 (message "Bahá'í date: %s" s)))) 150 (message "Bahá'í date: %s" s))))
154 151
155(define-obsolete-function-alias
156 'calendar-print-bahai-date 'calendar-bahai-print-date "23.1")
157
158(defun calendar-bahai-read-date () 152(defun calendar-bahai-read-date ()
159 "Interactively read the arguments for a Bahá'í date command. 153 "Interactively read the arguments for a Bahá'í date command.
160Reads a year, month and day." 154Reads a year, month and day."
@@ -179,9 +173,6 @@ Reads a year, month and day."
179 (lambda (x) (and (< 0 x) (<= x 19)))))) 173 (lambda (x) (and (< 0 x) (<= x 19))))))
180 (list (list month day year)))) 174 (list (list month day year))))
181 175
182(define-obsolete-function-alias
183 'calendar-bahai-prompt-for-date 'calendar-bahai-read-date "23.1")
184
185;;;###cal-autoload 176;;;###cal-autoload
186(defun calendar-bahai-goto-date (date &optional noecho) 177(defun calendar-bahai-goto-date (date &optional noecho)
187 "Move cursor to Bahá'í date DATE; echo Bahá'í date unless NOECHO is non-nil." 178 "Move cursor to Bahá'í date DATE; echo Bahá'í date unless NOECHO is non-nil."
@@ -190,9 +181,6 @@ Reads a year, month and day."
190 (calendar-bahai-to-absolute date))) 181 (calendar-bahai-to-absolute date)))
191 (or noecho (calendar-bahai-print-date))) 182 (or noecho (calendar-bahai-print-date)))
192 183
193(define-obsolete-function-alias
194 'calendar-goto-bahai-date 'calendar-bahai-goto-date "23.1")
195
196(defvar displayed-month) 184(defvar displayed-month)
197(defvar displayed-year) 185(defvar displayed-year)
198 186
@@ -270,9 +258,6 @@ will not be marked in the calendar. This function is provided for use with
270 (diary-list-entries-1 calendar-bahai-month-name-array 258 (diary-list-entries-1 calendar-bahai-month-name-array
271 diary-bahai-entry-symbol 259 diary-bahai-entry-symbol
272 'calendar-bahai-from-absolute)) 260 'calendar-bahai-from-absolute))
273(define-obsolete-function-alias
274 'list-bahai-diary-entries 'diary-bahai-list-entries "23.1")
275
276 261
277(autoload 'calendar-mark-1 "diary-lib") 262(autoload 'calendar-mark-1 "diary-lib")
278 263
@@ -284,10 +269,6 @@ passed to `calendar-mark-visible-date' as MARK."
284 (calendar-mark-1 month day year 'calendar-bahai-from-absolute 269 (calendar-mark-1 month day year 'calendar-bahai-from-absolute
285 'calendar-bahai-to-absolute color)) 270 'calendar-bahai-to-absolute color))
286 271
287(define-obsolete-function-alias
288 'mark-bahai-calendar-date-pattern 'calendar-bahai-mark-date-pattern "23.1")
289
290
291(autoload 'diary-mark-entries-1 "diary-lib") 272(autoload 'diary-mark-entries-1 "diary-lib")
292 273
293;;;###diary-autoload 274;;;###diary-autoload
@@ -300,10 +281,6 @@ window. See `diary-bahai-list-entries' for more information."
300 diary-bahai-entry-symbol 281 diary-bahai-entry-symbol
301 'calendar-bahai-from-absolute)) 282 'calendar-bahai-from-absolute))
302 283
303(define-obsolete-function-alias
304 'mark-bahai-diary-entries 'diary-bahai-mark-entries "23.1")
305
306
307(autoload 'diary-insert-entry-1 "diary-lib") 284(autoload 'diary-insert-entry-1 "diary-lib")
308 285
309;;;###cal-autoload 286;;;###cal-autoload
@@ -316,9 +293,6 @@ Prefix argument ARG makes the entry nonmarking."
316 diary-bahai-entry-symbol 293 diary-bahai-entry-symbol
317 'calendar-bahai-from-absolute)) 294 'calendar-bahai-from-absolute))
318 295
319(define-obsolete-function-alias
320 'insert-bahai-diary-entry 'diary-bahai-insert-entry "23.1")
321
322;;;###cal-autoload 296;;;###cal-autoload
323(defun diary-bahai-insert-monthly-entry (arg) 297(defun diary-bahai-insert-monthly-entry (arg)
324 "Insert a monthly diary entry. 298 "Insert a monthly diary entry.
@@ -329,9 +303,6 @@ Prefix argument ARG makes the entry nonmarking."
329 diary-bahai-entry-symbol 303 diary-bahai-entry-symbol
330 'calendar-bahai-from-absolute)) 304 'calendar-bahai-from-absolute))
331 305
332(define-obsolete-function-alias
333 'insert-monthly-bahai-diary-entry 'diary-bahai-insert-monthly-entry "23.1")
334
335;;;###cal-autoload 306;;;###cal-autoload
336(defun diary-bahai-insert-yearly-entry (arg) 307(defun diary-bahai-insert-yearly-entry (arg)
337 "Insert an annual diary entry. 308 "Insert an annual diary entry.
@@ -342,9 +313,6 @@ Prefix argument ARG will make the entry nonmarking."
342 diary-bahai-entry-symbol 313 diary-bahai-entry-symbol
343 'calendar-bahai-from-absolute)) 314 'calendar-bahai-from-absolute))
344 315
345(define-obsolete-function-alias
346 'insert-yearly-bahai-diary-entry 'diary-bahai-insert-yearly-entry "23.1")
347
348(defvar date) 316(defvar date)
349 317
350;; To be called from diary-list-sexp-entries, where DATE is bound. 318;; To be called from diary-list-sexp-entries, where DATE is bound.
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index e266613680a..c5860653a3e 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -58,9 +58,6 @@
58 :prefix "calendar-chinese-" 58 :prefix "calendar-chinese-"
59 :group 'calendar) 59 :group 'calendar)
60 60
61(define-obsolete-variable-alias 'chinese-calendar-time-zone
62 'calendar-chinese-time-zone "23.1")
63
64(defcustom calendar-chinese-time-zone 61(defcustom calendar-chinese-time-zone
65 '(if (< year 1928) 62 '(if (< year 1928)
66 (+ 465 (/ 40.0 60.0)) 63 (+ 465 (/ 40.0 60.0))
@@ -78,18 +75,12 @@ Default is for Beijing. This is an expression in `year' since it changed at
78(put 'chinese-calendar-time-zone 'risky-local-variable t) 75(put 'chinese-calendar-time-zone 'risky-local-variable t)
79 76
80 77
81(define-obsolete-variable-alias 'chinese-calendar-location-name
82 'calendar-chinese-location-name "23.1")
83
84;; FIXME unused. 78;; FIXME unused.
85(defcustom calendar-chinese-location-name "Beijing" 79(defcustom calendar-chinese-location-name "Beijing"
86 "Name of location used for calculation of Chinese calendar." 80 "Name of location used for calculation of Chinese calendar."
87 :type 'string 81 :type 'string
88 :group 'calendar-chinese) 82 :group 'calendar-chinese)
89 83
90(define-obsolete-variable-alias 'chinese-calendar-daylight-time-offset
91 'calendar-chinese-daylight-time-offset "23.1")
92
93(defcustom calendar-chinese-daylight-time-offset 0 84(defcustom calendar-chinese-daylight-time-offset 0
94;; The correct value is as follows, but the Chinese calendrical 85;; The correct value is as follows, but the Chinese calendrical
95;; authorities do NOT use DST in determining astronomical events: 86;; authorities do NOT use DST in determining astronomical events:
@@ -99,9 +90,6 @@ Default is for no daylight saving time."
99 :type 'integer 90 :type 'integer
100 :group 'calendar-chinese) 91 :group 'calendar-chinese)
101 92
102(define-obsolete-variable-alias 'chinese-calendar-standard-time-zone-name
103 'calendar-chinese-standard-time-zone-name "23.1")
104
105(defcustom calendar-chinese-standard-time-zone-name 93(defcustom calendar-chinese-standard-time-zone-name
106 '(if (< year 1928) 94 '(if (< year 1928)
107 "PMT" 95 "PMT"
@@ -112,17 +100,11 @@ at 1928-01-01 00:00:00 from `PMT' to `CST'."
112 :type 'sexp 100 :type 'sexp
113 :group 'calendar-chinese) 101 :group 'calendar-chinese)
114 102
115(define-obsolete-variable-alias 'chinese-calendar-daylight-time-zone-name
116 'calendar-chinese-daylight-time-zone-name "23.1")
117
118(defcustom calendar-chinese-daylight-time-zone-name "CDT" 103(defcustom calendar-chinese-daylight-time-zone-name "CDT"
119 "Abbreviated name of daylight saving time zone used for Chinese calendar." 104 "Abbreviated name of daylight saving time zone used for Chinese calendar."
120 :type 'string 105 :type 'string
121 :group 'calendar-chinese) 106 :group 'calendar-chinese)
122 107
123(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-starts
124 'calendar-chinese-daylight-saving-start "23.1")
125
126(defcustom calendar-chinese-daylight-saving-start nil 108(defcustom calendar-chinese-daylight-saving-start nil
127;; The correct value is as follows, but the Chinese calendrical 109;; The correct value is as follows, but the Chinese calendrical
128;; authorities do NOT use DST in determining astronomical events: 110;; authorities do NOT use DST in determining astronomical events:
@@ -135,9 +117,6 @@ Default is for no daylight saving time. See documentation of
135 :type 'sexp 117 :type 'sexp
136 :group 'calendar-chinese) 118 :group 'calendar-chinese)
137 119
138(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-ends
139 'calendar-chinese-daylight-saving-end "23.1")
140
141(defcustom calendar-chinese-daylight-saving-end nil 120(defcustom calendar-chinese-daylight-saving-end nil
142;; The correct value is as follows, but the Chinese calendrical 121;; The correct value is as follows, but the Chinese calendrical
143;; authorities do NOT use DST in determining astronomical events: 122;; authorities do NOT use DST in determining astronomical events:
@@ -148,27 +127,18 @@ Default is for no daylight saving time. See documentation of
148 :type 'sexp 127 :type 'sexp
149 :group 'calendar-chinese) 128 :group 'calendar-chinese)
150 129
151(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-starts-time
152 'calendar-chinese-daylight-saving-start-time "23.1")
153
154(defcustom calendar-chinese-daylight-saving-start-time 0 130(defcustom calendar-chinese-daylight-saving-start-time 0
155 "Number of minutes after midnight that daylight saving time starts. 131 "Number of minutes after midnight that daylight saving time starts.
156Default is for no daylight saving time." 132Default is for no daylight saving time."
157 :type 'integer 133 :type 'integer
158 :group 'calendar-chinese) 134 :group 'calendar-chinese)
159 135
160(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-ends-time
161 'calendar-chinese-daylight-saving-end-time "23.1")
162
163(defcustom calendar-chinese-daylight-saving-end-time 0 136(defcustom calendar-chinese-daylight-saving-end-time 0
164 "Number of minutes after midnight that daylight saving time ends. 137 "Number of minutes after midnight that daylight saving time ends.
165Default is for no daylight saving time." 138Default is for no daylight saving time."
166 :type 'integer 139 :type 'integer
167 :group 'calendar-chinese) 140 :group 'calendar-chinese)
168 141
169(define-obsolete-variable-alias 'chinese-calendar-celestial-stem
170 'calendar-chinese-celestial-stem "23.1")
171
172(defcustom calendar-chinese-celestial-stem 142(defcustom calendar-chinese-celestial-stem
173 ["Jia" "Yi" "Bing" "Ding" "Wu" "Ji" "Geng" "Xin" "Ren" "Gui"] 143 ["Jia" "Yi" "Bing" "Ding" "Wu" "Ji" "Geng" "Xin" "Ren" "Gui"]
174 "Prefixes used by `calendar-chinese-sexagesimal-name'." 144 "Prefixes used by `calendar-chinese-sexagesimal-name'."
@@ -184,9 +154,6 @@ Default is for no daylight saving time."
184 (string :tag "Ren") 154 (string :tag "Ren")
185 (string :tag "Gui"))) 155 (string :tag "Gui")))
186 156
187(define-obsolete-variable-alias 'chinese-calendar-terrestrial-branch
188 'calendar-chinese-terrestrial-branch "23.1")
189
190(defcustom calendar-chinese-terrestrial-branch 157(defcustom calendar-chinese-terrestrial-branch
191 ["Zi" "Chou" "Yin" "Mao" "Chen" "Si" "Wu" "Wei" "Shen" "You" "Xu" "Hai"] 158 ["Zi" "Chou" "Yin" "Mao" "Chen" "Si" "Wu" "Wei" "Shen" "You" "Xu" "Hai"]
192 "Suffixes used by `calendar-chinese-sexagesimal-name'." 159 "Suffixes used by `calendar-chinese-sexagesimal-name'."
@@ -432,9 +399,6 @@ Sunday, December 31, 1 BC is imaginary."
432 (calendar-chinese-year g-year)) 399 (calendar-chinese-year g-year))
433 (calendar-chinese-year (1+ g-year)))))))) 400 (calendar-chinese-year (1+ g-year))))))))
434 401
435(define-obsolete-function-alias 'calendar-absolute-from-chinese
436 'calendar-chinese-to-absolute "23.1")
437
438(defun calendar-chinese-from-absolute (date) 402(defun calendar-chinese-from-absolute (date)
439 "Compute Chinese date (cycle year month day) corresponding to absolute DATE. 403 "Compute Chinese date (cycle year month day) corresponding to absolute DATE.
440The absolute date is the number of days elapsed since the (imaginary) 404The absolute date is the number of days elapsed since the (imaginary)
@@ -599,9 +563,6 @@ Defaults to today's date if DATE is not given."
599 (message "Chinese date: %s" 563 (message "Chinese date: %s"
600 (calendar-chinese-date-string (calendar-cursor-to-date t)))) 564 (calendar-chinese-date-string (calendar-cursor-to-date t))))
601 565
602(define-obsolete-function-alias 'calendar-print-chinese-date
603 'calendar-chinese-print-date "23.1")
604
605(defun calendar-chinese-months-to-alist (l) 566(defun calendar-chinese-months-to-alist (l)
606 "Make list of months L into an assoc list." 567 "Make list of months L into an assoc list."
607 (and l (car l) 568 (and l (car l)
@@ -671,9 +632,6 @@ Echo Chinese date unless NOECHO is non-nil."
671 (calendar-chinese-to-absolute date))) 632 (calendar-chinese-to-absolute date)))
672 (or noecho (calendar-chinese-print-date))) 633 (or noecho (calendar-chinese-print-date)))
673 634
674(define-obsolete-function-alias 'calendar-goto-chinese-date
675 'calendar-chinese-goto-date "23.1")
676
677(defvar date) 635(defvar date)
678 636
679;; To be called from diary-list-sexp-entries, where DATE is bound. 637;; To be called from diary-list-sexp-entries, where DATE is bound.
diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el
index 2472d295123..54a1fe9bff5 100644
--- a/lisp/calendar/cal-coptic.el
+++ b/lisp/calendar/cal-coptic.el
@@ -75,9 +75,6 @@ Gregorian date Sunday, December 31, 1 BC."
75 (* 30 (1- month)) ; days in prior months this year 75 (* 30 (1- month)) ; days in prior months this year
76 day))) ; days so far this month 76 day))) ; days so far this month
77 77
78(define-obsolete-function-alias 'calendar-absolute-from-coptic
79 'calendar-coptic-to-absolute "23.1")
80
81(defun calendar-coptic-from-absolute (date) 78(defun calendar-coptic-from-absolute (date)
82 "Compute the Coptic equivalent for absolute date DATE. 79 "Compute the Coptic equivalent for absolute date DATE.
83The result is a list of the form (MONTH DAY YEAR). 80The result is a list of the form (MONTH DAY YEAR).
@@ -135,9 +132,6 @@ Defaults to today's date if DATE is not given."
135 (message "Date is pre-%s calendar" calendar-coptic-name) 132 (message "Date is pre-%s calendar" calendar-coptic-name)
136 (message "%s date: %s" calendar-coptic-name f)))) 133 (message "%s date: %s" calendar-coptic-name f))))
137 134
138(define-obsolete-function-alias 'calendar-print-coptic-date
139 'calendar-coptic-print-date "23.1")
140
141(defun calendar-coptic-read-date () 135(defun calendar-coptic-read-date ()
142 "Interactively read the arguments for a Coptic date command. 136 "Interactively read the arguments for a Coptic date command.
143Reads a year, month, and day." 137Reads a year, month, and day."
@@ -164,9 +158,6 @@ Reads a year, month, and day."
164 (lambda (x) (and (< 0 x) (<= x last)))))) 158 (lambda (x) (and (< 0 x) (<= x last))))))
165 (list (list month day year)))) 159 (list (list month day year))))
166 160
167(define-obsolete-function-alias 'coptic-prompt-for-date
168 'calendar-coptic-read-date "23.1")
169
170;;;###cal-autoload 161;;;###cal-autoload
171(defun calendar-coptic-goto-date (date &optional noecho) 162(defun calendar-coptic-goto-date (date &optional noecho)
172 "Move cursor to Coptic date DATE. 163 "Move cursor to Coptic date DATE.
@@ -176,8 +167,6 @@ Echo Coptic date unless NOECHO is t."
176 (calendar-coptic-to-absolute date))) 167 (calendar-coptic-to-absolute date)))
177 (or noecho (calendar-coptic-print-date))) 168 (or noecho (calendar-coptic-print-date)))
178 169
179(define-obsolete-function-alias 'calendar-goto-coptic-date
180 'calendar-coptic-goto-date "23.1")
181 170
182(defvar date) 171(defvar date)
183 172
@@ -208,9 +197,6 @@ Gregorian date Sunday, December 31, 1 BC."
208 (let ((calendar-coptic-epoch calendar-ethiopic-epoch)) 197 (let ((calendar-coptic-epoch calendar-ethiopic-epoch))
209 (calendar-coptic-to-absolute date))) 198 (calendar-coptic-to-absolute date)))
210 199
211(define-obsolete-function-alias 'calendar-absolute-from-ethiopic
212 'calendar-ethiopic-to-absolute "23.1")
213
214(defun calendar-ethiopic-from-absolute (date) 200(defun calendar-ethiopic-from-absolute (date)
215 "Compute the Ethiopic equivalent for absolute date DATE. 201 "Compute the Ethiopic equivalent for absolute date DATE.
216The result is a list of the form (MONTH DAY YEAR). 202The result is a list of the form (MONTH DAY YEAR).
@@ -238,9 +224,6 @@ Defaults to today's date if DATE is not given."
238 (calendar-coptic-month-name-array calendar-ethiopic-month-name-array)) 224 (calendar-coptic-month-name-array calendar-ethiopic-month-name-array))
239 (call-interactively 'calendar-coptic-print-date))) 225 (call-interactively 'calendar-coptic-print-date)))
240 226
241(define-obsolete-function-alias 'calendar-print-ethiopic-date
242 'calendar-ethiopic-print-date "23.1")
243
244;;;###cal-autoload 227;;;###cal-autoload
245(defun calendar-ethiopic-goto-date (date &optional noecho) 228(defun calendar-ethiopic-goto-date (date &optional noecho)
246 "Move cursor to Ethiopic date DATE. 229 "Move cursor to Ethiopic date DATE.
@@ -254,9 +237,6 @@ Echo Ethiopic date unless NOECHO is t."
254 (calendar-ethiopic-to-absolute date))) 237 (calendar-ethiopic-to-absolute date)))
255 (or noecho (calendar-ethiopic-print-date))) 238 (or noecho (calendar-ethiopic-print-date)))
256 239
257(define-obsolete-function-alias 'calendar-goto-ethiopic-date
258 'calendar-ethiopic-goto-date "23.1")
259
260;; To be called from diary-list-sexp-entries, where DATE is bound. 240;; To be called from diary-list-sexp-entries, where DATE is bound.
261;;;###diary-autoload 241;;;###diary-autoload
262(defun diary-ethiopic-date () 242(defun diary-ethiopic-date ()
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index cbcd231cca3..36318702d06 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -1,7 +1,7 @@
1;;; cal-french.el --- calendar functions for the French Revolutionary calendar 1;;; cal-french.el --- calendar functions for the French Revolutionary calendar
2 2
3;; Copyright (C) 1988-1989, 1992, 1994-1995, 1997, 2001-2014 Free 3;; Copyright (C) 1988-1989, 1992, 1994-1995, 1997, 2001-2014
4;; Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> 6;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
7;; Maintainer: Glenn Morris <rgm@gnu.org> 7;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -129,9 +129,6 @@ Gregorian date Sunday, December 31, 1 BC."
129 day ; days so far this month 129 day ; days so far this month
130 (1- calendar-french-epoch)))) ; days before start of calendar 130 (1- calendar-french-epoch)))) ; days before start of calendar
131 131
132(define-obsolete-function-alias 'calendar-absolute-from-french
133 'calendar-french-to-absolute "23.1")
134
135(defun calendar-french-from-absolute (date) 132(defun calendar-french-from-absolute (date)
136 "Compute the French Revolutionary equivalent for absolute date DATE. 133 "Compute the French Revolutionary equivalent for absolute date DATE.
137The result is a list of the form (MONTH DAY YEAR). 134The result is a list of the form (MONTH DAY YEAR).
@@ -196,9 +193,6 @@ Defaults to today's date if DATE is not given."
196 (message "Date is pre-French Revolution") 193 (message "Date is pre-French Revolution")
197 (message "French Revolutionary date: %s" f)))) 194 (message "French Revolutionary date: %s" f))))
198 195
199(define-obsolete-function-alias 'calendar-print-french-date
200 'calendar-french-print-date "23.1")
201
202;;;###cal-autoload 196;;;###cal-autoload
203(defun calendar-french-goto-date (date &optional noecho) 197(defun calendar-french-goto-date (date &optional noecho)
204 "Move cursor to French Revolutionary date DATE. 198 "Move cursor to French Revolutionary date DATE.
@@ -249,9 +243,6 @@ Echo French Revolutionary date unless NOECHO is non-nil."
249 (calendar-french-to-absolute date))) 243 (calendar-french-to-absolute date)))
250 (or noecho (calendar-french-print-date))) 244 (or noecho (calendar-french-print-date)))
251 245
252(define-obsolete-function-alias 'calendar-goto-french-date
253 'calendar-french-goto-date "23.1")
254
255(defvar date) 246(defvar date)
256 247
257;; To be called from diary-list-sexp-entries, where DATE is bound. 248;; To be called from diary-list-sexp-entries, where DATE is bound.
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index 4d20b1fa230..93ac3b722b5 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -32,9 +32,6 @@
32 32
33(require 'calendar) 33(require 'calendar)
34 34
35(define-obsolete-variable-alias 'diary-sabbath-candles-minutes
36 'diary-hebrew-sabbath-candles-minutes "23.1")
37
38(defcustom diary-hebrew-sabbath-candles-minutes 18 35(defcustom diary-hebrew-sabbath-candles-minutes 18
39 "Number of minutes before sunset for sabbath candle lighting. 36 "Number of minutes before sunset for sabbath candle lighting.
40Used by `diary-hebrew-sabbath-candles'." 37Used by `diary-hebrew-sabbath-candles'."
@@ -136,9 +133,6 @@ Gregorian date Sunday, December 31, 1 BC."
136 (calendar-hebrew-elapsed-days year) ; days in prior years 133 (calendar-hebrew-elapsed-days year) ; days in prior years
137 -1373429))) ; days elapsed before absolute date 1 134 -1373429))) ; days elapsed before absolute date 1
138 135
139(define-obsolete-function-alias 'calendar-absolute-from-hebrew
140 'calendar-hebrew-to-absolute "23.1")
141
142(defun calendar-hebrew-from-absolute (date) 136(defun calendar-hebrew-from-absolute (date)
143 "Compute the Hebrew date (month day year) corresponding to absolute DATE. 137 "Compute the Hebrew date (month day year) corresponding to absolute DATE.
144The absolute date is the number of days elapsed since the (imaginary) 138The absolute date is the number of days elapsed since the (imaginary)
@@ -194,9 +188,6 @@ Driven by the variable `calendar-date-display-form'."
194 (message "Hebrew date (until sunset): %s" 188 (message "Hebrew date (until sunset): %s"
195 (calendar-hebrew-date-string (calendar-cursor-to-date t)))) 189 (calendar-hebrew-date-string (calendar-cursor-to-date t))))
196 190
197(define-obsolete-function-alias 'calendar-print-hebrew-date
198 'calendar-hebrew-print-date "23.1")
199
200(defun calendar-hebrew-yahrzeit (death-date year) 191(defun calendar-hebrew-yahrzeit (death-date year)
201 "Absolute date of the anniversary of Hebrew DEATH-DATE in Hebrew YEAR." 192 "Absolute date of the anniversary of Hebrew DEATH-DATE in Hebrew YEAR."
202 (let ((death-day (calendar-extract-day death-date)) 193 (let ((death-day (calendar-extract-day death-date))
@@ -230,9 +221,6 @@ Driven by the variable `calendar-date-display-form'."
230 (t (calendar-hebrew-to-absolute 221 (t (calendar-hebrew-to-absolute
231 (list death-month death-day year)))))) 222 (list death-month death-day year))))))
232 223
233(define-obsolete-function-alias 'hebrew-calendar-yahrzeit
234 'calendar-hebrew-yahrzeit "23.1")
235
236(defun calendar-hebrew-read-date () 224(defun calendar-hebrew-read-date ()
237 "Interactively read the arguments for a Hebrew date command. 225 "Interactively read the arguments for a Hebrew date command.
238Reads a year, month, and day." 226Reads a year, month, and day."
@@ -284,9 +272,6 @@ Reads a year, month, and day."
284 (calendar-hebrew-to-absolute date))) 272 (calendar-hebrew-to-absolute date)))
285 (or noecho (calendar-hebrew-print-date))) 273 (or noecho (calendar-hebrew-print-date)))
286 274
287(define-obsolete-function-alias 'calendar-goto-hebrew-date
288 'calendar-hebrew-goto-date "23.1")
289
290(defvar displayed-month) ; from calendar-generate 275(defvar displayed-month) ; from calendar-generate
291 276
292(defun calendar-hebrew-date-is-visible-p (month day) 277(defun calendar-hebrew-date-is-visible-p (month day)
@@ -398,10 +383,6 @@ or ALL is non-nil."
398 "Hoshanah Rabbah")))))))) 383 "Hoshanah Rabbah"))))))))
399 384
400;;;###holiday-autoload 385;;;###holiday-autoload
401(define-obsolete-function-alias 'holiday-rosh-hashanah-etc
402 'holiday-hebrew-rosh-hashanah "23.1")
403
404;;;###holiday-autoload
405(defun holiday-hebrew-hanukkah (&optional all) 386(defun holiday-hebrew-hanukkah (&optional all)
406 "List of dates related to Hanukkah, as visible in calendar window. 387 "List of dates related to Hanukkah, as visible in calendar window.
407Shows only Hanukkah, unless `calendar-hebrew-all-holidays-flag' or ALL 388Shows only Hanukkah, unless `calendar-hebrew-all-holidays-flag' or ALL
@@ -434,10 +415,6 @@ is non-nil."
434 (list (list (calendar-gregorian-from-absolute abs-h) "Hanukkah"))))))) 415 (list (list (calendar-gregorian-from-absolute abs-h) "Hanukkah")))))))
435 416
436;;;###holiday-autoload 417;;;###holiday-autoload
437(define-obsolete-function-alias 'holiday-hanukkah
438 'holiday-hebrew-hanukkah "23.1")
439
440;;;###holiday-autoload
441(defun holiday-hebrew-passover (&optional all) 418(defun holiday-hebrew-passover (&optional all)
442 "List of dates related to Passover, as visible in calendar window. 419 "List of dates related to Passover, as visible in calendar window.
443Shows only the major holidays, unless `calendar-hebrew-all-holidays-flag' 420Shows only the major holidays, unless `calendar-hebrew-all-holidays-flag'
@@ -520,10 +497,6 @@ or ALL is non-nil."
520 "Shavuot (second day)"))))))))) 497 "Shavuot (second day)")))))))))
521 498
522;;;###holiday-autoload 499;;;###holiday-autoload
523(define-obsolete-function-alias 'holiday-passover-etc
524 'holiday-hebrew-passover "23.1")
525
526;;;###holiday-autoload
527(defun holiday-hebrew-tisha-b-av () 500(defun holiday-hebrew-tisha-b-av ()
528 "List of dates around Tisha B'Av, as visible in calendar window." 501 "List of dates around Tisha B'Av, as visible in calendar window."
529 (when (memq displayed-month '(5 6 7 8 9)) 502 (when (memq displayed-month '(5 6 7 8 9))
@@ -545,10 +518,6 @@ or ALL is non-nil."
545 (calendar-dayname-on-or-before 6 (+ abs-t-a 7))) 518 (calendar-dayname-on-or-before 6 (+ abs-t-a 7)))
546 "Shabbat Nahamu")))))) 519 "Shabbat Nahamu"))))))
547 520
548;;;###holiday-autoload
549(define-obsolete-function-alias 'holiday-tisha-b-av-etc
550 'holiday-hebrew-tisha-b-av "23.1")
551
552(autoload 'holiday-julian "cal-julian") 521(autoload 'holiday-julian "cal-julian")
553 522
554;;;###holiday-autoload 523;;;###holiday-autoload
@@ -634,9 +603,6 @@ is provided for use with `diary-nongregorian-listing-hook'."
634 (diary-list-entries-1 calendar-hebrew-month-name-array-leap-year 603 (diary-list-entries-1 calendar-hebrew-month-name-array-leap-year
635 diary-hebrew-entry-symbol 604 diary-hebrew-entry-symbol
636 'calendar-hebrew-from-absolute)) 605 'calendar-hebrew-from-absolute))
637;;;###diary-autoload
638(define-obsolete-function-alias 'list-hebrew-diary-entries
639 'diary-hebrew-list-entries "23.1")
640 606
641(autoload 'calendar-mark-complex "diary-lib") 607(autoload 'calendar-mark-complex "diary-lib")
642 608
@@ -662,10 +628,6 @@ passed to `calendar-mark-visible-date' as MARK."
662 (calendar-mark-complex month day year 628 (calendar-mark-complex month day year
663 'calendar-hebrew-from-absolute color)))) 629 'calendar-hebrew-from-absolute color))))
664 630
665;;;###diary-autoload
666(define-obsolete-function-alias 'mark-hebrew-calendar-date-pattern
667 'calendar-hebrew-mark-date-pattern "23.1")
668
669(autoload 'diary-mark-entries-1 "diary-lib") 631(autoload 'diary-mark-entries-1 "diary-lib")
670 632
671;;;###diary-autoload 633;;;###diary-autoload
@@ -678,10 +640,6 @@ window. See `list-hebrew-diary-entries' for more information."
678 diary-hebrew-entry-symbol 640 diary-hebrew-entry-symbol
679 'calendar-hebrew-from-absolute)) 641 'calendar-hebrew-from-absolute))
680 642
681;;;###diary-autoload
682(define-obsolete-function-alias 'mark-hebrew-diary-entries
683 'diary-hebrew-mark-entries "23.1")
684
685(autoload 'diary-insert-entry-1 "diary-lib") 643(autoload 'diary-insert-entry-1 "diary-lib")
686 644
687;;;###cal-autoload 645;;;###cal-autoload
@@ -693,10 +651,6 @@ Prefix argument ARG makes the entry nonmarking."
693 diary-hebrew-entry-symbol 651 diary-hebrew-entry-symbol
694 'calendar-hebrew-from-absolute)) 652 'calendar-hebrew-from-absolute))
695 653
696;;;###diary-autoload
697(define-obsolete-function-alias 'insert-hebrew-diary-entry
698 'diary-hebrew-insert-entry "23.1")
699
700;;;###cal-autoload 654;;;###cal-autoload
701(defun diary-hebrew-insert-monthly-entry (arg) 655(defun diary-hebrew-insert-monthly-entry (arg)
702 "Insert a monthly diary entry. 656 "Insert a monthly diary entry.
@@ -706,9 +660,6 @@ Prefix argument ARG makes the entry nonmarking."
706 (diary-insert-entry-1 'monthly arg calendar-hebrew-month-name-array-leap-year 660 (diary-insert-entry-1 'monthly arg calendar-hebrew-month-name-array-leap-year
707 diary-hebrew-entry-symbol 661 diary-hebrew-entry-symbol
708 'calendar-hebrew-from-absolute)) 662 'calendar-hebrew-from-absolute))
709;;;###diary-autoload
710(define-obsolete-function-alias 'insert-monthly-hebrew-diary-entry
711 'diary-hebrew-insert-monthly-entry "23.1")
712 663
713;;;###cal-autoload 664;;;###cal-autoload
714(defun diary-hebrew-insert-yearly-entry (arg) 665(defun diary-hebrew-insert-yearly-entry (arg)
@@ -719,9 +670,6 @@ Prefix argument ARG makes the entry nonmarking."
719 (diary-insert-entry-1 'yearly arg calendar-hebrew-month-name-array-leap-year 670 (diary-insert-entry-1 'yearly arg calendar-hebrew-month-name-array-leap-year
720 diary-hebrew-entry-symbol 671 diary-hebrew-entry-symbol
721 'calendar-hebrew-from-absolute)) 672 'calendar-hebrew-from-absolute))
722;;;###diary-autoload
723(define-obsolete-function-alias 'insert-yearly-hebrew-diary-entry
724 'diary-hebrew-insert-yearly-entry "23.1")
725 673
726;;;###autoload 674;;;###autoload
727(defun calendar-hebrew-list-yahrzeits (death-date start-year end-year) 675(defun calendar-hebrew-list-yahrzeits (death-date start-year end-year)
@@ -786,10 +734,6 @@ from the cursor position."
786 (calendar-absolute-from-gregorian (list 1 1 i))))))) "\n")))) 734 (calendar-absolute-from-gregorian (list 1 1 i))))))) "\n"))))
787 (message "Computing Yahrzeits...done")) 735 (message "Computing Yahrzeits...done"))
788 736
789;;;###autoload
790(define-obsolete-function-alias 'list-yahrzeit-dates
791 'calendar-hebrew-list-yahrzeits "23.1")
792
793(defun calendar-hebrew-birthday (date year) 737(defun calendar-hebrew-birthday (date year)
794 "Absolute date of the anniversary of Hebrew birth DATE, in Hebrew YEAR." 738 "Absolute date of the anniversary of Hebrew birth DATE, in Hebrew YEAR."
795 (let ((b-day (calendar-extract-day date)) 739 (let ((b-day (calendar-extract-day date))
@@ -869,8 +813,6 @@ use when highlighting the day in the calendar."
869 "" 813 ""
870 (format " and %d day%s" 814 (format " and %d day%s"
871 day (if (= day 1) "" "s")))))))))) 815 day (if (= day 1) "" "s"))))))))))
872;;;###diary-autoload
873(define-obsolete-function-alias 'diary-omer 'diary-hebrew-omer "23.1")
874 816
875(autoload 'diary-make-date "diary-lib") 817(autoload 'diary-make-date "diary-lib")
876 818
@@ -912,9 +854,6 @@ use when highlighting the day in the calendar."
912 (diary-ordinal-suffix diff)))))) 854 (diary-ordinal-suffix diff))))))
913 855
914;;;###diary-autoload 856;;;###diary-autoload
915(define-obsolete-function-alias 'diary-yahrzeit 'diary-hebrew-yahrzeit "23.1")
916
917;;;###diary-autoload
918(defun diary-hebrew-rosh-hodesh (&optional mark) 857(defun diary-hebrew-rosh-hodesh (&optional mark)
919 "Rosh Hodesh diary entry. 858 "Rosh Hodesh diary entry.
920Entry applies if date is Rosh Hodesh, the day before, or the Saturday before. 859Entry applies if date is Rosh Hodesh, the day before, or the Saturday before.
@@ -976,9 +915,6 @@ use when highlighting the day in the calendar."
976 (calendar-hebrew-last-month-of-year 915 (calendar-hebrew-last-month-of-year
977 h-year)) 916 h-year))
978 0 h-month))))))))) 917 0 h-month)))))))))
979;;;###diary-autoload
980(define-obsolete-function-alias 'diary-rosh-hodesh
981 'diary-hebrew-rosh-hodesh "23.1")
982 918
983(defconst calendar-hebrew-parashiot-names 919(defconst calendar-hebrew-parashiot-names
984 ["Bereshith" "Noah" "Lech L'cha" "Vayera" "Hayei Sarah" "Toledoth" 920 ["Bereshith" "Noah" "Lech L'cha" "Vayera" "Hayei Sarah" "Toledoth"
@@ -1166,8 +1102,6 @@ use when highlighting the day in the calendar."
1166 (cdr parasha)))) 1102 (cdr parasha))))
1167 (calendar-hebrew-parasha-name parasha))))))))) 1103 (calendar-hebrew-parasha-name parasha)))))))))
1168 1104
1169(define-obsolete-function-alias 'diary-parasha 'diary-hebrew-parasha "23.1")
1170
1171 1105
1172(declare-function solar-setup "solar" ()) 1106(declare-function solar-setup "solar" ())
1173(declare-function solar-sunrise-sunset "solar" (date)) 1107(declare-function solar-sunrise-sunset "solar" (date))
@@ -1199,10 +1133,6 @@ use when highlighting the day in the calendar."
1199 60.0)) 1133 60.0))
1200 (cdr sunset))))))))) 1134 (cdr sunset)))))))))
1201 1135
1202;;;###diary-autoload
1203(define-obsolete-function-alias 'diary-sabbath-candles
1204 'diary-hebrew-sabbath-candles "23.1")
1205
1206 1136
1207(provide 'cal-hebrew) 1137(provide 'cal-hebrew)
1208 1138
diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el
index 50034755d6f..00e54658fb2 100644
--- a/lisp/calendar/cal-islam.el
+++ b/lisp/calendar/cal-islam.el
@@ -87,9 +87,6 @@ Gregorian date Sunday, December 31, 1 BC."
87 leap-years-in-cycle ; leap days this cycle 87 leap-years-in-cycle ; leap days this cycle
88 (1- calendar-islamic-epoch)))) ; days before start of calendar 88 (1- calendar-islamic-epoch)))) ; days before start of calendar
89 89
90(define-obsolete-function-alias 'calendar-absolute-from-islamic
91 'calendar-islamic-to-absolute "23.1")
92
93(defun calendar-islamic-from-absolute (date) 90(defun calendar-islamic-from-absolute (date)
94 "Compute the Islamic date (month day year) corresponding to absolute DATE. 91 "Compute the Islamic date (month day year) corresponding to absolute DATE.
95The absolute date is the number of days elapsed since the (imaginary) 92The absolute date is the number of days elapsed since the (imaginary)
@@ -141,9 +138,6 @@ Driven by the variable `calendar-date-display-form'."
141 (message "Date is pre-Islamic") 138 (message "Date is pre-Islamic")
142 (message "Islamic date (until sunset): %s" i)))) 139 (message "Islamic date (until sunset): %s" i))))
143 140
144(define-obsolete-function-alias 'calendar-print-islamic-date
145 'calendar-islamic-print-date "23.1")
146
147(defun calendar-islamic-read-date () 141(defun calendar-islamic-read-date ()
148 "Interactively read the arguments for an Islamic date command. 142 "Interactively read the arguments for an Islamic date command.
149Reads a year, month, and day." 143Reads a year, month, and day."
@@ -177,9 +171,6 @@ Reads a year, month, and day."
177 (calendar-islamic-to-absolute date))) 171 (calendar-islamic-to-absolute date)))
178 (or noecho (calendar-islamic-print-date))) 172 (or noecho (calendar-islamic-print-date)))
179 173
180(define-obsolete-function-alias 'calendar-goto-islamic-date
181 'calendar-islamic-goto-date "23.1")
182
183(defvar displayed-month) ; from calendar-generate 174(defvar displayed-month) ; from calendar-generate
184(defvar displayed-year) 175(defvar displayed-year)
185 176
@@ -260,9 +251,6 @@ marked in the calendar. This function is provided for use with
260 diary-islamic-entry-symbol 251 diary-islamic-entry-symbol
261 'calendar-islamic-from-absolute)) 252 'calendar-islamic-from-absolute))
262 253
263(define-obsolete-function-alias 'list-islamic-diary-entries
264 'diary-islamic-list-entries "23.1")
265
266(autoload 'calendar-mark-1 "diary-lib") 254(autoload 'calendar-mark-1 "diary-lib")
267 255
268;;;###diary-autoload 256;;;###diary-autoload
@@ -273,9 +261,6 @@ passed to `calendar-mark-visible-date' as MARK."
273 (calendar-mark-1 month day year 'calendar-islamic-from-absolute 261 (calendar-mark-1 month day year 'calendar-islamic-from-absolute
274 'calendar-islamic-to-absolute color)) 262 'calendar-islamic-to-absolute color))
275 263
276(define-obsolete-function-alias 'mark-islamic-calendar-date-pattern
277 'calendar-islamic-mark-date-pattern "23.1")
278
279(autoload 'diary-mark-entries-1 "diary-lib") 264(autoload 'diary-mark-entries-1 "diary-lib")
280 265
281;;;###diary-autoload 266;;;###diary-autoload
@@ -288,9 +273,6 @@ window. See `diary-islamic-list-entries' for more information."
288 diary-islamic-entry-symbol 273 diary-islamic-entry-symbol
289 'calendar-islamic-from-absolute)) 274 'calendar-islamic-from-absolute))
290 275
291(define-obsolete-function-alias
292 'mark-islamic-diary-entries 'diary-islamic-mark-entries "23.1")
293
294(autoload 'diary-insert-entry-1 "diary-lib") 276(autoload 'diary-insert-entry-1 "diary-lib")
295 277
296;;;###cal-autoload 278;;;###cal-autoload
@@ -303,9 +285,6 @@ Prefix argument ARG makes the entry nonmarking."
303 diary-islamic-entry-symbol 285 diary-islamic-entry-symbol
304 'calendar-islamic-from-absolute)) 286 'calendar-islamic-from-absolute))
305 287
306(define-obsolete-function-alias 'insert-islamic-diary-entry
307 'diary-islamic-insert-entry "23.1")
308
309;;;###cal-autoload 288;;;###cal-autoload
310(defun diary-islamic-insert-monthly-entry (arg) 289(defun diary-islamic-insert-monthly-entry (arg)
311 "Insert a monthly diary entry. 290 "Insert a monthly diary entry.
@@ -316,9 +295,6 @@ Prefix argument ARG makes the entry nonmarking."
316 diary-islamic-entry-symbol 295 diary-islamic-entry-symbol
317 'calendar-islamic-from-absolute)) 296 'calendar-islamic-from-absolute))
318 297
319(define-obsolete-function-alias 'insert-monthly-islamic-diary-entry
320 'diary-islamic-insert-monthly-entry "23.1")
321
322;;;###cal-autoload 298;;;###cal-autoload
323(defun diary-islamic-insert-yearly-entry (arg) 299(defun diary-islamic-insert-yearly-entry (arg)
324 "Insert an annual diary entry. 300 "Insert an annual diary entry.
@@ -328,8 +304,6 @@ Prefix argument ARG makes the entry nonmarking."
328 (diary-insert-entry-1 'yearly arg calendar-islamic-month-name-array 304 (diary-insert-entry-1 'yearly arg calendar-islamic-month-name-array
329 diary-islamic-entry-symbol 305 diary-islamic-entry-symbol
330 'calendar-islamic-from-absolute)) 306 'calendar-islamic-from-absolute))
331(define-obsolete-function-alias
332 'insert-yearly-islamic-diary-entry 'diary-islamic-insert-yearly-entry "23.1")
333 307
334(defvar date) 308(defvar date)
335 309
diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index 31626e4c02c..88527cf68cc 100644
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -47,9 +47,6 @@ Sunday). The Gregorian date Sunday, December 31, 1 BC is imaginary."
47 (* 7 (1- (calendar-extract-month date))) 47 (* 7 (1- (calendar-extract-month date)))
48 (if (zerop day) 6 (1- day))))) 48 (if (zerop day) 6 (1- day)))))
49 49
50(define-obsolete-function-alias 'calendar-absolute-from-iso
51 'calendar-iso-to-absolute "23.1")
52
53;;;###cal-autoload 50;;;###cal-autoload
54(defun calendar-iso-from-absolute (date) 51(defun calendar-iso-from-absolute (date)
55 "Compute the `ISO commercial date' corresponding to the absolute DATE. 52 "Compute the `ISO commercial date' corresponding to the absolute DATE.
@@ -91,9 +88,6 @@ date Sunday, December 31, 1 BC."
91 (message "ISO date: %s" 88 (message "ISO date: %s"
92 (calendar-iso-date-string (calendar-cursor-to-date t)))) 89 (calendar-iso-date-string (calendar-cursor-to-date t))))
93 90
94(define-obsolete-function-alias 'calendar-print-iso-date
95 'calendar-iso-print-date "23.1")
96
97(defun calendar-iso-read-date (&optional dayflag) 91(defun calendar-iso-read-date (&optional dayflag)
98 "Interactively read the arguments for an ISO date command. 92 "Interactively read the arguments for an ISO date command.
99Reads a year and week, and if DAYFLAG is non-nil a day (otherwise 93Reads a year and week, and if DAYFLAG is non-nil a day (otherwise
@@ -118,9 +112,6 @@ taken to be 1)."
118 1))) 112 1)))
119 (list (list week day year)))) 113 (list (list week day year))))
120 114
121(define-obsolete-function-alias 'calendar-iso-read-args
122 'calendar-iso-read-date "23.1")
123
124;;;###cal-autoload 115;;;###cal-autoload
125(defun calendar-iso-goto-date (date &optional noecho) 116(defun calendar-iso-goto-date (date &optional noecho)
126 "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil." 117 "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil."
@@ -129,9 +120,6 @@ taken to be 1)."
129 (calendar-iso-to-absolute date))) 120 (calendar-iso-to-absolute date)))
130 (or noecho (calendar-iso-print-date))) 121 (or noecho (calendar-iso-print-date)))
131 122
132(define-obsolete-function-alias 'calendar-goto-iso-date
133 'calendar-iso-goto-date "23.1")
134
135;;;###cal-autoload 123;;;###cal-autoload
136(defun calendar-iso-goto-week (date &optional noecho) 124(defun calendar-iso-goto-week (date &optional noecho)
137 "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil. 125 "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil.
@@ -141,9 +129,6 @@ Interactively, goes to the first day of the specified week."
141 (calendar-iso-to-absolute date))) 129 (calendar-iso-to-absolute date)))
142 (or noecho (calendar-iso-print-date))) 130 (or noecho (calendar-iso-print-date)))
143 131
144(define-obsolete-function-alias 'calendar-goto-iso-week
145 'calendar-iso-goto-week "23.1")
146
147(defvar date) 132(defvar date)
148 133
149;; To be called from diary-list-sexp-entries, where DATE is bound. 134;; To be called from diary-list-sexp-entries, where DATE is bound.
diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el
index 2953b1b7a84..481f987b29b 100644
--- a/lisp/calendar/cal-julian.el
+++ b/lisp/calendar/cal-julian.el
@@ -45,9 +45,6 @@ The Gregorian date Sunday, December 31, 1 BC is imaginary."
45 (/ (1- year) 4) 45 (/ (1- year) 4)
46 -2))) 46 -2)))
47 47
48(define-obsolete-function-alias 'calendar-absolute-from-julian
49 'calendar-julian-to-absolute "23.1")
50
51;;;###cal-autoload 48;;;###cal-autoload
52(defun calendar-julian-from-absolute (date) 49(defun calendar-julian-from-absolute (date)
53 "Compute the Julian (month day year) corresponding to the absolute DATE. 50 "Compute the Julian (month day year) corresponding to the absolute DATE.
@@ -93,9 +90,6 @@ Driven by the variable `calendar-date-display-form'."
93 (message "Julian date: %s" 90 (message "Julian date: %s"
94 (calendar-julian-date-string (calendar-cursor-to-date t)))) 91 (calendar-julian-date-string (calendar-cursor-to-date t))))
95 92
96(define-obsolete-function-alias 'calendar-print-julian-date
97 'calendar-julian-print-date "23.1")
98
99;;;###cal-autoload 93;;;###cal-autoload
100(defun calendar-julian-goto-date (date &optional noecho) 94(defun calendar-julian-goto-date (date &optional noecho)
101 "Move cursor to Julian DATE; echo Julian date unless NOECHO is non-nil." 95 "Move cursor to Julian DATE; echo Julian date unless NOECHO is non-nil."
@@ -132,9 +126,6 @@ Driven by the variable `calendar-date-display-form'."
132 (calendar-julian-to-absolute date))) 126 (calendar-julian-to-absolute date)))
133 (or noecho (calendar-julian-print-date))) 127 (or noecho (calendar-julian-print-date)))
134 128
135(define-obsolete-function-alias 'calendar-goto-julian-date
136 'calendar-julian-goto-date "23.1")
137
138;;;###holiday-autoload 129;;;###holiday-autoload
139(defun holiday-julian (month day string) 130(defun holiday-julian (month day string)
140 "Holiday on MONTH, DAY (Julian) called STRING. 131 "Holiday on MONTH, DAY (Julian) called STRING.
@@ -156,9 +147,6 @@ nil if it is not visible in the current calendar window."
156 "Absolute date of astronomical (Julian) day number D." 147 "Absolute date of astronomical (Julian) day number D."
157 (- d 1721424.5)) 148 (- d 1721424.5))
158 149
159(define-obsolete-function-alias 'calendar-absolute-from-astro
160 'calendar-astro-to-absolute "23.1")
161
162;;;###cal-autoload 150;;;###cal-autoload
163(defun calendar-astro-from-absolute (d) 151(defun calendar-astro-from-absolute (d)
164 "Astronomical (Julian) day number of absolute date D." 152 "Astronomical (Julian) day number of absolute date D."
@@ -181,9 +169,6 @@ Defaults to today's date if DATE is not given."
181 "Astronomical (Julian) day number (at noon UTC): %s.0" 169 "Astronomical (Julian) day number (at noon UTC): %s.0"
182 (calendar-astro-date-string (calendar-cursor-to-date t)))) 170 (calendar-astro-date-string (calendar-cursor-to-date t))))
183 171
184(define-obsolete-function-alias 'calendar-print-astro-day-number
185 'calendar-astro-print-day-number "23.1")
186
187;;;###cal-autoload 172;;;###cal-autoload
188(defun calendar-astro-goto-day-number (daynumber &optional noecho) 173(defun calendar-astro-goto-day-number (daynumber &optional noecho)
189 "Move cursor to astronomical (Julian) DAYNUMBER. 174 "Move cursor to astronomical (Julian) DAYNUMBER.
@@ -197,8 +182,6 @@ Echo astronomical (Julian) day number unless NOECHO is non-nil."
197 (calendar-astro-to-absolute daynumber)))) 182 (calendar-astro-to-absolute daynumber))))
198 (or noecho (calendar-astro-print-day-number))) 183 (or noecho (calendar-astro-print-day-number)))
199 184
200(define-obsolete-function-alias 'calendar-goto-astro-day-number
201 'calendar-astro-goto-day-number "23.1")
202 185
203(defvar date) 186(defvar date)
204 187
diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index 81b71d5b3ad..17a01656220 100644
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -132,9 +132,6 @@ but some use 1137140. Using 1232041 gives you Spinden's correlation; using
132 (message "Mayan date: %s" 132 (message "Mayan date: %s"
133 (calendar-mayan-date-string (calendar-cursor-to-date t)))) 133 (calendar-mayan-date-string (calendar-cursor-to-date t))))
134 134
135(define-obsolete-function-alias 'calendar-print-mayan-date
136 'calendar-mayan-print-date "23.1")
137
138(defun calendar-mayan-read-haab-date () 135(defun calendar-mayan-read-haab-date ()
139 "Prompt for a Mayan haab date." 136 "Prompt for a Mayan haab date."
140 (let* ((completion-ignore-case t) 137 (let* ((completion-ignore-case t)
@@ -179,9 +176,6 @@ Echo Mayan date unless NOECHO is non-nil."
179 (calendar-absolute-from-gregorian (calendar-cursor-to-date)))))) 176 (calendar-absolute-from-gregorian (calendar-cursor-to-date))))))
180 (or noecho (calendar-mayan-print-date))) 177 (or noecho (calendar-mayan-print-date)))
181 178
182(define-obsolete-function-alias 'calendar-next-haab-date
183 'calendar-mayan-next-haab-date "23.1")
184
185;;;###cal-autoload 179;;;###cal-autoload
186(defun calendar-mayan-previous-haab-date (haab-date &optional noecho) 180(defun calendar-mayan-previous-haab-date (haab-date &optional noecho)
187 "Move cursor to previous instance of Mayan HAAB-DATE. 181 "Move cursor to previous instance of Mayan HAAB-DATE.
@@ -194,9 +188,6 @@ Echo Mayan date unless NOECHO is non-nil."
194 (1- (calendar-absolute-from-gregorian (calendar-cursor-to-date)))))) 188 (1- (calendar-absolute-from-gregorian (calendar-cursor-to-date))))))
195 (or noecho (calendar-mayan-print-date))) 189 (or noecho (calendar-mayan-print-date)))
196 190
197(define-obsolete-function-alias 'calendar-previous-haab-date
198 'calendar-mayan-previous-haab-date "23.1")
199
200(defun calendar-mayan-haab-to-string (haab) 191(defun calendar-mayan-haab-to-string (haab)
201 "Convert Mayan HAAB date (a pair) into its traditional written form." 192 "Convert Mayan HAAB date (a pair) into its traditional written form."
202 (let ((month (cdr haab))) 193 (let ((month (cdr haab)))
@@ -247,9 +238,6 @@ Echo Mayan date unless NOECHO is non-nil."
247 (calendar-absolute-from-gregorian (calendar-cursor-to-date)))))) 238 (calendar-absolute-from-gregorian (calendar-cursor-to-date))))))
248 (or noecho (calendar-mayan-print-date))) 239 (or noecho (calendar-mayan-print-date)))
249 240
250(define-obsolete-function-alias 'calendar-next-tzolkin-date
251 'calendar-mayan-next-tzolkin-date "23.1")
252
253;;;###cal-autoload 241;;;###cal-autoload
254(defun calendar-mayan-previous-tzolkin-date (tzolkin-date &optional noecho) 242(defun calendar-mayan-previous-tzolkin-date (tzolkin-date &optional noecho)
255 "Move cursor to previous instance of Mayan TZOLKIN-DATE. 243 "Move cursor to previous instance of Mayan TZOLKIN-DATE.
@@ -262,9 +250,6 @@ Echo Mayan date unless NOECHO is non-nil."
262 (1- (calendar-absolute-from-gregorian (calendar-cursor-to-date)))))) 250 (1- (calendar-absolute-from-gregorian (calendar-cursor-to-date))))))
263 (or noecho (calendar-mayan-print-date))) 251 (or noecho (calendar-mayan-print-date)))
264 252
265(define-obsolete-function-alias 'calendar-previous-tzolkin-date
266 'calendar-mayan-previous-tzolkin-date "23.1")
267
268(defun calendar-mayan-tzolkin-to-string (tzolkin) 253(defun calendar-mayan-tzolkin-to-string (tzolkin)
269 "Convert Mayan TZOLKIN date (a pair) into its traditional written form." 254 "Convert Mayan TZOLKIN date (a pair) into its traditional written form."
270 (format "%d %s" 255 (format "%d %s"
@@ -309,9 +294,6 @@ Echo Mayan date unless NOECHO is non-nil."
309 (calendar-goto-date (calendar-gregorian-from-absolute date)) 294 (calendar-goto-date (calendar-gregorian-from-absolute date))
310 (or noecho (calendar-mayan-print-date))))) 295 (or noecho (calendar-mayan-print-date)))))
311 296
312(define-obsolete-function-alias 'calendar-next-calendar-round-date
313 'calendar-mayan-next-round-date "23.1")
314
315;;;###cal-autoload 297;;;###cal-autoload
316(defun calendar-mayan-previous-round-date 298(defun calendar-mayan-previous-round-date
317 (tzolkin-date haab-date &optional noecho) 299 (tzolkin-date haab-date &optional noecho)
@@ -330,9 +312,6 @@ Echo Mayan date unless NOECHO is non-nil."
330 (calendar-goto-date (calendar-gregorian-from-absolute date)) 312 (calendar-goto-date (calendar-gregorian-from-absolute date))
331 (or noecho (calendar-mayan-print-date))))) 313 (or noecho (calendar-mayan-print-date)))))
332 314
333(define-obsolete-function-alias 'calendar-previous-calendar-round-date
334 'calendar-mayan-previous-round-date "23.1")
335
336(defun calendar-mayan-long-count-to-absolute (c) 315(defun calendar-mayan-long-count-to-absolute (c)
337 "Compute the absolute date corresponding to the Mayan Long Count C. 316 "Compute the absolute date corresponding to the Mayan Long Count C.
338Long count is a list (baktun katun tun uinal kin)" 317Long count is a list (baktun katun tun uinal kin)"
@@ -344,9 +323,6 @@ Long count is a list (baktun katun tun uinal kin)"
344 ;; Days before absolute date 0. 323 ;; Days before absolute date 0.
345 (- calendar-mayan-days-before-absolute-zero))) 324 (- calendar-mayan-days-before-absolute-zero)))
346 325
347(define-obsolete-function-alias 'calendar-absolute-from-mayan-long-count
348 'calendar-mayan-long-count-to-absolute "23.1")
349
350(defun calendar-mayan-long-count-common-era (lc) 326(defun calendar-mayan-long-count-common-era (lc)
351 "Return non-nil if long count LC represents a date in the Common Era." 327 "Return non-nil if long count LC represents a date in the Common Era."
352 (let ((base (calendar-mayan-long-count-from-absolute 1))) 328 (let ((base (calendar-mayan-long-count-from-absolute 1)))
@@ -377,9 +353,6 @@ Echo Mayan date unless NOECHO is non-nil."
377 (calendar-mayan-long-count-to-absolute date))) 353 (calendar-mayan-long-count-to-absolute date)))
378 (or noecho (calendar-mayan-print-date))) 354 (or noecho (calendar-mayan-print-date)))
379 355
380(define-obsolete-function-alias 'calendar-goto-mayan-long-count-date
381 'calendar-mayan-goto-long-count-date "23.1")
382
383(defvar date) 356(defvar date)
384 357
385;; To be called from diary-list-sexp-entries, where DATE is bound. 358;; To be called from diary-list-sexp-entries, where DATE is bound.
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index 23e1b5e0e97..df16646cc26 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -278,14 +278,6 @@ is non-nil."
278 ["Show diary" diary-show-all-entries] 278 ["Show diary" diary-show-all-entries]
279 ["Exit calendar" calendar-exit])) 279 ["Exit calendar" calendar-exit]))
280 280
281;; Undocumented and probably useless.
282(defvar cal-menu-load-hook nil
283 "Hook run on loading of the `cal-menu' package.")
284(make-obsolete-variable 'cal-menu-load-hook
285 "it will be removed in future." "23.1")
286
287(run-hooks 'cal-menu-load-hook)
288
289(provide 'cal-menu) 281(provide 'cal-menu)
290 282
291;; Local Variables: 283;; Local Variables:
diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index 5410ff79ff4..a72f188f37e 100644
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -175,9 +175,6 @@ EVENT is an event like `last-nonmenu-event'."
175 (t (list month 1 year)))))) 175 (t (list month 1 year))))))
176 (run-hooks 'calendar-move-hook))) 176 (run-hooks 'calendar-move-hook)))
177 177
178(define-obsolete-function-alias
179 'scroll-calendar-left 'calendar-scroll-left "23.1")
180
181;;;###cal-autoload 178;;;###cal-autoload
182(defun calendar-scroll-right (&optional arg event) 179(defun calendar-scroll-right (&optional arg event)
183 "Scroll the displayed calendar window right by ARG months. 180 "Scroll the displayed calendar window right by ARG months.
@@ -188,9 +185,6 @@ EVENT is an event like `last-nonmenu-event'."
188 last-nonmenu-event)) 185 last-nonmenu-event))
189 (calendar-scroll-left (- (or arg 1)) event)) 186 (calendar-scroll-left (- (or arg 1)) event))
190 187
191(define-obsolete-function-alias
192 'scroll-calendar-right 'calendar-scroll-right "23.1")
193
194;;;###cal-autoload 188;;;###cal-autoload
195(defun calendar-scroll-left-three-months (arg &optional event) 189(defun calendar-scroll-left-three-months (arg &optional event)
196 "Scroll the displayed calendar window left by 3*ARG months. 190 "Scroll the displayed calendar window left by 3*ARG months.
@@ -201,9 +195,6 @@ EVENT is an event like `last-nonmenu-event'."
201 last-nonmenu-event)) 195 last-nonmenu-event))
202 (calendar-scroll-left (* 3 arg) event)) 196 (calendar-scroll-left (* 3 arg) event))
203 197
204(define-obsolete-function-alias 'scroll-calendar-left-three-months
205 'calendar-scroll-left-three-months "23.1")
206
207;; cf scroll-bar-toolkit-scroll 198;; cf scroll-bar-toolkit-scroll
208;;;###cal-autoload 199;;;###cal-autoload
209(defun calendar-scroll-toolkit-scroll (event) 200(defun calendar-scroll-toolkit-scroll (event)
@@ -226,9 +217,6 @@ EVENT is an event like `last-nonmenu-event'."
226 last-nonmenu-event)) 217 last-nonmenu-event))
227 (calendar-scroll-left (* -3 arg) event)) 218 (calendar-scroll-left (* -3 arg) event))
228 219
229(define-obsolete-function-alias 'scroll-calendar-right-three-months
230 'calendar-scroll-right-three-months "23.1")
231
232;;;###cal-autoload 220;;;###cal-autoload
233(defun calendar-forward-day (arg) 221(defun calendar-forward-day (arg)
234 "Move the cursor forward ARG days. 222 "Move the cursor forward ARG days.
diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el
index c79c3f94420..1a69ade82da 100644
--- a/lisp/calendar/cal-persia.el
+++ b/lisp/calendar/cal-persia.el
@@ -87,9 +87,6 @@ Gregorian date Sunday, December 31, 1 BC."
87 (calendar-persian-last-day-of-month m year)) 87 (calendar-persian-last-day-of-month m year))
88 day)))) ; days so far this month 88 day)))) ; days so far this month
89 89
90(define-obsolete-function-alias 'calendar-absolute-from-persian
91 'calendar-persian-to-absolute "23.1")
92
93(defun calendar-persian-year-from-absolute (date) 90(defun calendar-persian-year-from-absolute (date)
94 "Persian year corresponding to the absolute DATE." 91 "Persian year corresponding to the absolute DATE."
95 (let* ((d0 ; prior days since start of 2820 cycles 92 (let* ((d0 ; prior days since start of 2820 cycles
@@ -163,9 +160,6 @@ Gregorian date Sunday, December 31, 1 BC."
163 (message "Persian date: %s" 160 (message "Persian date: %s"
164 (calendar-persian-date-string (calendar-cursor-to-date t)))) 161 (calendar-persian-date-string (calendar-cursor-to-date t))))
165 162
166(define-obsolete-function-alias 'calendar-print-persian-date
167 'calendar-persian-print-date "23.1")
168
169(defun calendar-persian-read-date () 163(defun calendar-persian-read-date ()
170 "Interactively read the arguments for a Persian date command. 164 "Interactively read the arguments for a Persian date command.
171Reads a year, month, and day." 165Reads a year, month, and day."
@@ -192,9 +186,6 @@ Reads a year, month, and day."
192 (lambda (x) (and (< 0 x) (<= x last)))))) 186 (lambda (x) (and (< 0 x) (<= x last))))))
193 (list (list month day year)))) 187 (list (list month day year))))
194 188
195(define-obsolete-function-alias 'persian-prompt-for-date
196 'calendar-persian-read-date "23.1")
197
198;;;###cal-autoload 189;;;###cal-autoload
199(defun calendar-persian-goto-date (date &optional noecho) 190(defun calendar-persian-goto-date (date &optional noecho)
200 "Move cursor to Persian date DATE. 191 "Move cursor to Persian date DATE.
@@ -204,8 +195,6 @@ Echo Persian date unless NOECHO is non-nil."
204 (calendar-persian-to-absolute date))) 195 (calendar-persian-to-absolute date)))
205 (or noecho (calendar-persian-print-date))) 196 (or noecho (calendar-persian-print-date)))
206 197
207(define-obsolete-function-alias 'calendar-goto-persian-date
208 'calendar-persian-goto-date "23.1")
209 198
210(defvar date) 199(defvar date)
211 200
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 6c03a774d0a..e522649b497 100644
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -65,9 +65,6 @@ Relevant if `calendar-setup' has the value `one-frame'."
65 (vertical-scroll-bars boolean)) 65 (vertical-scroll-bars boolean))
66 :group 'calendar) 66 :group 'calendar)
67 67
68(define-obsolete-variable-alias 'calendar-after-frame-setup-hooks
69 'calendar-after-frame-setup-hook "23.1")
70
71(defcustom calendar-after-frame-setup-hook nil 68(defcustom calendar-after-frame-setup-hook nil
72 "List of functions to be run after creating a calendar and/or diary frame." 69 "List of functions to be run after creating a calendar and/or diary frame."
73 :type 'hook 70 :type 'hook
@@ -150,36 +147,6 @@ If PROMPT is non-nil, prompt for the month and year to use."
150 (if (eq config 'one-frame) 147 (if (eq config 'one-frame)
151 (calendar-dedicate-diary)))))) 148 (calendar-dedicate-diary))))))
152 149
153
154;;;###cal-autoload
155(defun calendar-one-frame-setup (&optional prompt)
156 "Display calendar and diary in a single dedicated frame.
157See `calendar-frame-setup' for more information."
158 (declare (obsolete calendar-frame-setup "23.1"))
159 (calendar-frame-setup 'one-frame prompt))
160
161;;;###cal-autoload
162(defun calendar-only-one-frame-setup (&optional prompt)
163 "Display calendar in a dedicated frame.
164See `calendar-frame-setup' for more information."
165 (declare (obsolete calendar-frame-setup "23.1"))
166 (calendar-frame-setup 'calendar-only prompt))
167
168;;;###cal-autoload
169(defun calendar-two-frame-setup (&optional prompt)
170 "Display calendar and diary in separate, dedicated frames.
171See `calendar-frame-setup' for more information."
172 (declare (obsolete calendar-frame-setup "23.1"))
173 (calendar-frame-setup 'two-frames prompt))
174
175;; Undocumented and probably useless.
176(defvar cal-x-load-hook nil
177 "Hook run on loading of the `cal-x' package.")
178(make-obsolete-variable 'cal-x-load-hook "it will be removed in future." "23.1")
179
180(run-hooks 'cal-x-load-hook)
181
182
183(provide 'cal-x) 150(provide 'cal-x)
184 151
185;;; cal-x.el ends here 152;;; cal-x.el ends here
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 0292561a8ad..b4df4b31176 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -189,9 +189,6 @@ movement commands will not work correctly."
189 (calendar-redraw)) 189 (calendar-redraw))
190 :group 'calendar) 190 :group 'calendar)
191 191
192(define-obsolete-variable-alias 'view-diary-entries-initially
193 'calendar-view-diary-initially-flag "23.1")
194
195(defcustom calendar-view-diary-initially-flag nil 192(defcustom calendar-view-diary-initially-flag nil
196 "Non-nil means display current date's diary entries on entry to calendar. 193 "Non-nil means display current date's diary entries on entry to calendar.
197The diary is displayed in another window when the calendar is first displayed, 194The diary is displayed in another window when the calendar is first displayed,
@@ -201,9 +198,6 @@ be overridden by the value of `calendar-setup'."
201 :type 'boolean 198 :type 'boolean
202 :group 'diary) 199 :group 'diary)
203 200
204(define-obsolete-variable-alias 'mark-diary-entries-in-calendar
205 'calendar-mark-diary-entries-flag "23.1")
206
207;; FIXME :set 201;; FIXME :set
208(defcustom calendar-mark-diary-entries-flag nil 202(defcustom calendar-mark-diary-entries-flag nil
209 "Non-nil means mark dates with diary entries, in the calendar window. 203 "Non-nil means mark dates with diary entries, in the calendar window.
@@ -225,8 +219,6 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
225See the variable `calendar-today-marker'." 219See the variable `calendar-today-marker'."
226 :group 'calendar-faces) 220 :group 'calendar-faces)
227 221
228(define-obsolete-face-alias 'calendar-today-face 'calendar-today "22.1")
229
230(defface diary 222(defface diary
231 '((((min-colors 88) (class color) (background light)) 223 '((((min-colors 88) (class color) (background light))
232 :foreground "red1") 224 :foreground "red1")
@@ -243,8 +235,6 @@ Used to mark diary entries in the calendar (see `diary-entry-marker'),
243and to highlight the date header in the fancy diary." 235and to highlight the date header in the fancy diary."
244 :group 'calendar-faces) 236 :group 'calendar-faces)
245 237
246(define-obsolete-face-alias 'diary-face 'diary "22.1")
247
248(defface holiday 238(defface holiday
249 '((((class color) (background light)) 239 '((((class color) (background light))
250 :background "pink") 240 :background "pink")
@@ -256,8 +246,6 @@ and to highlight the date header in the fancy diary."
256See `calendar-holiday-marker'." 246See `calendar-holiday-marker'."
257 :group 'calendar-faces) 247 :group 'calendar-faces)
258 248
259(define-obsolete-face-alias 'holiday-face 'holiday "22.1")
260
261(defface calendar-weekday-header '((t :inherit font-lock-constant-face)) 249(defface calendar-weekday-header '((t :inherit font-lock-constant-face))
262 "Face used for weekday column headers in the calendar. 250 "Face used for weekday column headers in the calendar.
263See also the face `calendar-weekend-header'." 251See also the face `calendar-weekend-header'."
@@ -307,9 +295,6 @@ The value can be either a single-character string (e.g. \"*\") or a face."
307 :group 'holidays 295 :group 'holidays
308 :version "23.1") 296 :version "23.1")
309 297
310(define-obsolete-variable-alias 'view-calendar-holidays-initially
311 'calendar-view-holidays-initially-flag "23.1")
312
313(defcustom calendar-view-holidays-initially-flag nil 298(defcustom calendar-view-holidays-initially-flag nil
314 "Non-nil means display holidays for current three month period on entry. 299 "Non-nil means display holidays for current three month period on entry.
315The holidays are displayed in another window when the calendar is first 300The holidays are displayed in another window when the calendar is first
@@ -317,9 +302,6 @@ displayed."
317 :type 'boolean 302 :type 'boolean
318 :group 'holidays) 303 :group 'holidays)
319 304
320(define-obsolete-variable-alias 'mark-holidays-in-calendar
321 'calendar-mark-holidays-flag "23.1")
322
323;; FIXME :set 305;; FIXME :set
324(defcustom calendar-mark-holidays-flag nil 306(defcustom calendar-mark-holidays-flag nil
325 "Non-nil means mark dates of holidays in the calendar window. 307 "Non-nil means mark dates of holidays in the calendar window.
@@ -338,9 +320,6 @@ This is the place to add key bindings to `calendar-mode-map'."
338 :type 'hook 320 :type 'hook
339 :group 'calendar-hooks) 321 :group 'calendar-hooks)
340 322
341(define-obsolete-variable-alias 'initial-calendar-window-hook
342 'calendar-initial-window-hook "23.1")
343
344(defcustom calendar-initial-window-hook nil 323(defcustom calendar-initial-window-hook nil
345 "List of functions to be called when the calendar window is created. 324 "List of functions to be called when the calendar window is created.
346Quitting the calendar and re-entering it will cause these functions 325Quitting the calendar and re-entering it will cause these functions
@@ -348,9 +327,6 @@ to be called again."
348 :type 'hook 327 :type 'hook
349 :group 'calendar-hooks) 328 :group 'calendar-hooks)
350 329
351(define-obsolete-variable-alias 'today-visible-calendar-hook
352 'calendar-today-visible-hook "23.1")
353
354(defcustom calendar-today-visible-hook nil 330(defcustom calendar-today-visible-hook nil
355 "List of functions called whenever the current date is visible. 331 "List of functions called whenever the current date is visible.
356To mark today's date, add the function `calendar-mark-today'. 332To mark today's date, add the function `calendar-mark-today'.
@@ -363,9 +339,6 @@ since it may cause the movement commands to fail."
363 :options '(calendar-mark-today calendar-star-date) 339 :options '(calendar-mark-today calendar-star-date)
364 :group 'calendar-hooks) 340 :group 'calendar-hooks)
365 341
366(define-obsolete-variable-alias 'today-invisible-calendar-hook
367 'calendar-today-invisible-hook "23.1")
368
369(defcustom calendar-today-invisible-hook nil 342(defcustom calendar-today-invisible-hook nil
370 "List of functions called whenever the current date is not visible. 343 "List of functions called whenever the current date is not visible.
371See also `calendar-today-visible-hook'." 344See also `calendar-today-visible-hook'."
@@ -694,54 +667,22 @@ details, see the documentation for the variable `diary-list-entries-hook'."
694 :group 'diary 667 :group 'diary
695 :version "25.1") 668 :version "25.1")
696 669
697(define-obsolete-variable-alias 'hebrew-diary-entry-symbol
698 'diary-hebrew-entry-symbol "23.1")
699
700(defcustom diary-hebrew-entry-symbol "H" 670(defcustom diary-hebrew-entry-symbol "H"
701 "Symbol indicating a diary entry according to the Hebrew calendar." 671 "Symbol indicating a diary entry according to the Hebrew calendar."
702 :type 'string 672 :type 'string
703 :group 'diary) 673 :group 'diary)
704 674
705(define-obsolete-variable-alias 'islamic-diary-entry-symbol
706 'diary-islamic-entry-symbol "23.1")
707
708(defcustom diary-islamic-entry-symbol "I" 675(defcustom diary-islamic-entry-symbol "I"
709 "Symbol indicating a diary entry according to the Islamic calendar." 676 "Symbol indicating a diary entry according to the Islamic calendar."
710 :type 'string 677 :type 'string
711 :group 'diary) 678 :group 'diary)
712 679
713(define-obsolete-variable-alias 'bahai-diary-entry-symbol
714 'diary-bahai-entry-symbol "23.1")
715
716(defcustom diary-bahai-entry-symbol "B" 680(defcustom diary-bahai-entry-symbol "B"
717 "Symbol indicating a diary entry according to the Bahá'í calendar." 681 "Symbol indicating a diary entry according to the Bahá'í calendar."
718 :type 'string 682 :type 'string
719 :group 'diary) 683 :group 'diary)
720 684
721(defcustom european-calendar-style nil 685(defcustom calendar-date-style 'american
722 "Non-nil means use the European style of dates in the diary and display.
723In this case, a date like 1/2/1990 would be interpreted as
724February 1, 1990. See `diary-european-date-forms' for the
725default European diary date styles.
726
727Setting this variable directly does not take effect (if the
728calendar package is already loaded). Rather, use either
729\\[customize] or the function `calendar-set-date-style'."
730 :type 'boolean
731 ;; Without :initialize (require 'calendar) throws an error because
732 ;; calendar-set-date-style is undefined at this point.
733 :initialize 'custom-initialize-default
734 :set (lambda (symbol value)
735 (if value
736 (calendar-set-date-style 'european)
737 (calendar-set-date-style 'american)))
738 :group 'calendar)
739
740(make-obsolete-variable 'european-calendar-style 'calendar-date-style "23.1")
741
742;; If this is autoloaded, c-d-s gets set before any customization of e-c-s.
743(defcustom calendar-date-style (if european-calendar-style 'european
744 'american)
745 "Your preferred style for writing dates. 686 "Your preferred style for writing dates.
746The options are: 687The options are:
747`american' - month/day/year 688`american' - month/day/year
@@ -790,9 +731,6 @@ but `diary-date-forms' (which see)."
790 (choice symbol regexp))))) 731 (choice symbol regexp)))))
791 :group 'diary) 732 :group 'diary)
792 733
793(define-obsolete-variable-alias 'american-date-diary-pattern
794 'diary-american-date-forms "23.1")
795
796(defcustom diary-american-date-forms 734(defcustom diary-american-date-forms
797 '((month "/" day "[^/0-9]") 735 '((month "/" day "[^/0-9]")
798 (month "/" day "/" year "[^0-9]") 736 (month "/" day "/" year "[^0-9]")
@@ -814,9 +752,6 @@ but `diary-date-forms' (which see)."
814 (choice symbol regexp))))) 752 (choice symbol regexp)))))
815 :group 'diary) 753 :group 'diary)
816 754
817(define-obsolete-variable-alias 'european-date-diary-pattern
818 'diary-european-date-forms "23.1")
819
820(defcustom diary-european-date-forms 755(defcustom diary-european-date-forms
821 '((day "/" month "[^/0-9]") 756 '((day "/" month "[^/0-9]")
822 (day "/" month "/" year "[^0-9]") 757 (day "/" month "/" year "[^0-9]")
@@ -906,9 +841,6 @@ Normally you should not customize this, but `calendar-date-display-form'
906 :version "23.1" 841 :version "23.1"
907 :group 'calendar) 842 :group 'calendar)
908 843
909(define-obsolete-variable-alias 'european-calendar-display-form
910 'calendar-european-date-display-form "23.1")
911
912(defcustom calendar-european-date-display-form 844(defcustom calendar-european-date-display-form
913 '((if dayname (concat dayname ", ")) day " " monthname " " year) 845 '((if dayname (concat dayname ", ")) day " " monthname " " year)
914 "Pseudo-pattern governing the way a date appears in the European style. 846 "Pseudo-pattern governing the way a date appears in the European style.
@@ -917,9 +849,6 @@ Normally you should not customize this, but `calendar-date-display-form'
917 :type 'sexp 849 :type 'sexp
918 :group 'calendar) 850 :group 'calendar)
919 851
920(define-obsolete-variable-alias 'american-calendar-display-form
921 'calendar-american-date-display-form "23.1")
922
923(defcustom calendar-american-date-display-form 852(defcustom calendar-american-date-display-form
924 '((if dayname (concat dayname ", ")) monthname " " day ", " year) 853 '((if dayname (concat dayname ", ")) monthname " " day ", " year)
925 "Pseudo-pattern governing the way a date appears in the American style. 854 "Pseudo-pattern governing the way a date appears in the American style.
@@ -1034,21 +963,6 @@ The valid styles are described in the documentation of `calendar-date-style'."
1034 (calendar-redraw) 963 (calendar-redraw)
1035 (calendar-update-mode-line)) 964 (calendar-update-mode-line))
1036 965
1037(defun european-calendar ()
1038 "Set the interpretation and display of dates to the European style."
1039 (declare (obsolete calendar-set-date-style "23.1"))
1040 (interactive)
1041 (calendar-set-date-style 'european))
1042
1043(defun american-calendar ()
1044 "Set the interpretation and display of dates to the American style."
1045 (declare (obsolete calendar-set-date-style "23.1"))
1046 (interactive)
1047 (calendar-set-date-style 'american))
1048
1049(define-obsolete-variable-alias 'holidays-in-diary-buffer
1050 'diary-show-holidays-flag "23.1")
1051
1052(defcustom diary-show-holidays-flag t 966(defcustom diary-show-holidays-flag t
1053 "Non-nil means include holidays in the diary display. 967 "Non-nil means include holidays in the diary display.
1054The holidays appear in the mode line of the diary buffer, or in the 968The holidays appear in the mode line of the diary buffer, or in the
@@ -1062,9 +976,6 @@ somewhat; setting it to nil makes the diary display faster."
1062 :type 'boolean 976 :type 'boolean
1063 :group 'calendar) 977 :group 'calendar)
1064 978
1065(define-obsolete-variable-alias 'all-hebrew-calendar-holidays
1066 'calendar-hebrew-all-holidays-flag "23.1")
1067
1068(defcustom calendar-hebrew-all-holidays-flag nil 979(defcustom calendar-hebrew-all-holidays-flag nil
1069 "If nil, show only major holidays from the Hebrew calendar. 980 "If nil, show only major holidays from the Hebrew calendar.
1070This means only those Jewish holidays that appear on secular calendars. 981This means only those Jewish holidays that appear on secular calendars.
@@ -1073,9 +984,6 @@ calendar."
1073 :type 'boolean 984 :type 'boolean
1074 :group 'holidays) 985 :group 'holidays)
1075 986
1076(define-obsolete-variable-alias 'all-christian-calendar-holidays
1077 'calendar-christian-all-holidays-flag "23.1")
1078
1079(defcustom calendar-christian-all-holidays-flag nil 987(defcustom calendar-christian-all-holidays-flag nil
1080 "If nil, show only major holidays from the Christian calendar. 988 "If nil, show only major holidays from the Christian calendar.
1081This means only those Christian holidays that appear on secular calendars. 989This means only those Christian holidays that appear on secular calendars.
@@ -1084,9 +992,6 @@ calendar."
1084 :type 'boolean 992 :type 'boolean
1085 :group 'holidays) 993 :group 'holidays)
1086 994
1087(define-obsolete-variable-alias 'all-islamic-calendar-holidays
1088 'calendar-islamic-all-holidays-flag "23.1")
1089
1090(defcustom calendar-islamic-all-holidays-flag nil 995(defcustom calendar-islamic-all-holidays-flag nil
1091 "If nil, show only major holidays from the Islamic calendar. 996 "If nil, show only major holidays from the Islamic calendar.
1092This means only those Islamic holidays that appear on secular calendars. 997This means only those Islamic holidays that appear on secular calendars.
@@ -1095,9 +1000,6 @@ calendar."
1095 :type 'boolean 1000 :type 'boolean
1096 :group 'holidays) 1001 :group 'holidays)
1097 1002
1098(define-obsolete-variable-alias 'all-bahai-calendar-holidays
1099 'calendar-bahai-all-holidays-flag "23.1")
1100
1101(defcustom calendar-bahai-all-holidays-flag nil 1003(defcustom calendar-bahai-all-holidays-flag nil
1102 "If nil, show only major holidays from the Bahá'í calendar. 1004 "If nil, show only major holidays from the Bahá'í calendar.
1103These are the days on which work and school must be suspended. 1005These are the days on which work and school must be suspended.
@@ -1128,8 +1030,6 @@ calendar."
1128(defconst diary-fancy-buffer "*Fancy Diary Entries*" 1030(defconst diary-fancy-buffer "*Fancy Diary Entries*"
1129 "Name of the buffer used for the optional fancy display of the diary.") 1031 "Name of the buffer used for the optional fancy display of the diary.")
1130 1032
1131(define-obsolete-variable-alias 'fancy-diary-buffer 'diary-fancy-buffer "23.1")
1132
1133(defconst calendar-other-calendars-buffer "*Other Calendars*" 1033(defconst calendar-other-calendars-buffer "*Other Calendars*"
1134 "Name of the buffer used for the display of date on other calendars.") 1034 "Name of the buffer used for the display of date on other calendars.")
1135 1035
@@ -1162,9 +1062,6 @@ Optional NMONTHS is the number of months per year (default 12)."
1162 (and (< macro-y 0) (> ,mon 1) (setq ,yr (1- ,yr))) 1062 (and (< macro-y 0) (> ,mon 1) (setq ,yr (1- ,yr)))
1163 (if (< ,yr 1) (setq ,yr (1- ,yr))))) ; 0 AD -> -1 BC, etc 1063 (if (< ,yr 1) (setq ,yr (1- ,yr))))) ; 0 AD -> -1 BC, etc
1164 1064
1165(define-obsolete-function-alias 'increment-calendar-month
1166 'calendar-increment-month "23.1")
1167
1168(defvar displayed-month) 1065(defvar displayed-month)
1169(defvar displayed-year) 1066(defvar displayed-year)
1170 1067
@@ -1177,17 +1074,6 @@ MON defaults to `displayed-month'. YR defaults to `displayed-year'."
1177 (calendar-increment-month mon yr n) 1074 (calendar-increment-month mon yr n)
1178 (cons mon yr)) 1075 (cons mon yr))
1179 1076
1180(defmacro calendar-for-loop (var from init to final do &rest body)
1181 "Execute a for loop.
1182Evaluate BODY with VAR bound to successive integers from INIT to FINAL,
1183inclusive. The standard macro `dotimes' is preferable in most cases."
1184 (declare (obsolete "use `dotimes' or `while' instead." "23.1")
1185 (debug (symbolp "from" form "to" form "do" body))
1186 (indent defun))
1187 `(let ((,var (1- ,init)))
1188 (while (>= ,final (setq ,var (1+ ,var)))
1189 ,@body)))
1190
1191(defmacro calendar-sum (index initial condition expression) 1077(defmacro calendar-sum (index initial condition expression)
1192 "For INDEX = INITIAL, +1, ... (as long as CONDITION holds), sum EXPRESSION." 1078 "For INDEX = INITIAL, +1, ... (as long as CONDITION holds), sum EXPRESSION."
1193 (declare (debug (symbolp form form form))) 1079 (declare (debug (symbolp form form form)))
@@ -1247,25 +1133,16 @@ with disabled undo. Leaves point at point-min, displays BUFFER."
1247 "Extract the month part of DATE which has the form (month day year)." 1133 "Extract the month part of DATE which has the form (month day year)."
1248 (car date)) 1134 (car date))
1249 1135
1250(define-obsolete-function-alias 'extract-calendar-month
1251 'calendar-extract-month "23.1")
1252
1253;; Note gives wrong answer for result of (calendar-read-date 'noday), 1136;; Note gives wrong answer for result of (calendar-read-date 'noday),
1254;; but that is only used by `calendar-other-month'. 1137;; but that is only used by `calendar-other-month'.
1255(defsubst calendar-extract-day (date) 1138(defsubst calendar-extract-day (date)
1256 "Extract the day part of DATE which has the form (month day year)." 1139 "Extract the day part of DATE which has the form (month day year)."
1257 (cadr date)) 1140 (cadr date))
1258 1141
1259(define-obsolete-function-alias 'extract-calendar-day
1260 'calendar-extract-day "23.1")
1261
1262(defsubst calendar-extract-year (date) 1142(defsubst calendar-extract-year (date)
1263 "Extract the year part of DATE which has the form (month day year)." 1143 "Extract the year part of DATE which has the form (month day year)."
1264 (nth 2 date)) 1144 (nth 2 date))
1265 1145
1266(define-obsolete-function-alias 'extract-calendar-year
1267 'calendar-extract-year "23.1")
1268
1269(defsubst calendar-leap-year-p (year) 1146(defsubst calendar-leap-year-p (year)
1270 "Return t if YEAR is a Gregorian leap year. 1147 "Return t if YEAR is a Gregorian leap year.
1271A negative year is interpreted as BC; -1 being 1 BC, and so on." 1148A negative year is interpreted as BC; -1 being 1 BC, and so on."
@@ -1942,8 +1819,6 @@ the STRINGS are just concatenated and the result truncated."
1942 (dolist (b calendar-buffers) 1819 (dolist (b calendar-buffers)
1943 (quit-windows-on b kill)))))) 1820 (quit-windows-on b kill))))))
1944 1821
1945(define-obsolete-function-alias 'exit-calendar 'calendar-exit "23.1")
1946
1947(defun calendar-current-date (&optional offset) 1822(defun calendar-current-date (&optional offset)
1948 "Return the current date in a list (month day year). 1823 "Return the current date in a list (month day year).
1949Optional integer OFFSET is a number of days from the current date." 1824Optional integer OFFSET is a number of days from the current date."
@@ -2496,9 +2371,6 @@ Returns the corresponding Gregorian date."
2496 ;; Note there are side effects on calendar navigation. 2371 ;; Note there are side effects on calendar navigation.
2497 (<= 1 year)))) 2372 (<= 1 year))))
2498 2373
2499(define-obsolete-function-alias 'calendar-date-is-legal-p
2500 'calendar-date-is-valid-p "23.1")
2501
2502(defun calendar-date-equal (date1 date2) 2374(defun calendar-date-equal (date1 date2)
2503 "Return t if the DATE1 and DATE2 are the same." 2375 "Return t if the DATE1 and DATE2 are the same."
2504 (and 2376 (and
@@ -2571,9 +2443,6 @@ MARK defaults to `diary-entry-marker'."
2571 (make-overlay (1- (point)) (1+ (point))) 'face 2443 (make-overlay (1- (point)) (1+ (point))) 'face
2572 (calendar-make-temp-face mark)))))))) 2444 (calendar-make-temp-face mark))))))))
2573 2445
2574(define-obsolete-function-alias 'mark-visible-calendar-date
2575 'calendar-mark-visible-date "23.1")
2576
2577(defun calendar-star-date () 2446(defun calendar-star-date ()
2578 "Replace the date under the cursor in the calendar window with asterisks. 2447 "Replace the date under the cursor in the calendar window with asterisks.
2579You might want to add this function to `calendar-today-visible-hook'." 2448You might want to add this function to `calendar-today-visible-hook'."
@@ -2748,8 +2617,6 @@ If called by a mouse-event, pops up a menu with the result."
2748 "---") 2617 "---")
2749 (calendar-string-spread (list str) ?- width))))) 2618 (calendar-string-spread (list str) ?- width)))))
2750 2619
2751(define-obsolete-function-alias 'calendar-version 'emacs-version "23.1")
2752
2753(run-hooks 'calendar-load-hook) 2620(run-hooks 'calendar-load-hook)
2754 2621
2755(provide 'calendar) 2622(provide 'calendar)
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 17937c87fc9..954cb5102bf 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -48,13 +48,6 @@ are holidays."
48 :type 'boolean 48 :type 'boolean
49 :group 'diary) 49 :group 'diary)
50 50
51(defcustom diary-face 'diary
52 "Face name to use for diary entries."
53 :type 'face
54 :group 'calendar-faces)
55(make-obsolete-variable 'diary-face "customize the face `diary' instead."
56 "23.1")
57
58(defface diary-anniversary '((t :inherit font-lock-keyword-face)) 51(defface diary-anniversary '((t :inherit font-lock-keyword-face))
59 "Face used for anniversaries in the fancy diary display." 52 "Face used for anniversaries in the fancy diary display."
60 :version "22.1" 53 :version "22.1"
@@ -71,8 +64,6 @@ are holidays."
71 :version "22.1" 64 :version "22.1"
72 :group 'calendar-faces) 65 :group 'calendar-faces)
73 66
74(define-obsolete-face-alias 'diary-button-face 'diary-button "22.1")
75
76;; Face markup of calendar and diary displays: Any entry line that 67;; Face markup of calendar and diary displays: Any entry line that
77;; ends with [foo:value] where foo is a face attribute (except :box 68;; ends with [foo:value] where foo is a face attribute (except :box
78;; :stipple) or with [face:blah] tags, will have these values applied 69;; :stipple) or with [face:blah] tags, will have these values applied
@@ -132,9 +123,6 @@ are: `string', `symbol', `int', `tnil', `stringtnil.'"
132 :type 'function 123 :type 'function
133 :group 'diary) 124 :group 'diary)
134 125
135(define-obsolete-variable-alias 'sexp-diary-entry-symbol
136 'diary-sexp-entry-symbol "23.1")
137
138(defcustom diary-sexp-entry-symbol "%%" 126(defcustom diary-sexp-entry-symbol "%%"
139 "The string used to indicate a sexp diary entry in `diary-file'. 127 "The string used to indicate a sexp diary entry in `diary-file'.
140See the documentation for the function `diary-list-sexp-entries'." 128See the documentation for the function `diary-list-sexp-entries'."
@@ -167,9 +155,6 @@ Used for example by the appointment package - see `appt-activate'."
167 :type 'hook 155 :type 'hook
168 :group 'diary) 156 :group 'diary)
169 157
170(define-obsolete-variable-alias 'diary-display-hook 'diary-display-function
171 "23.1")
172
173(defcustom diary-display-function 'diary-fancy-display 158(defcustom diary-display-function 'diary-fancy-display
174 "Function used to display the diary. 159 "Function used to display the diary.
175The two standard options are `diary-fancy-display' and `diary-simple-display'. 160The two standard options are `diary-fancy-display' and `diary-simple-display'.
@@ -195,9 +180,6 @@ holidays), or hard copy output."
195 :version "23.2" ; simple->fancy 180 :version "23.2" ; simple->fancy
196 :group 'diary) 181 :group 'diary)
197 182
198(define-obsolete-variable-alias 'list-diary-entries-hook
199 'diary-list-entries-hook "23.1")
200
201(defcustom diary-list-entries-hook nil 183(defcustom diary-list-entries-hook nil
202 "Hook run after diary file is culled for relevant entries. 184 "Hook run after diary file is culled for relevant entries.
203 185
@@ -226,9 +208,6 @@ the main file and all included files, you would use the nongregorian hook."
226 :options '(diary-include-other-diary-files diary-sort-entries) 208 :options '(diary-include-other-diary-files diary-sort-entries)
227 :group 'diary) 209 :group 'diary)
228 210
229(define-obsolete-variable-alias 'mark-diary-entries-hook
230 'diary-mark-entries-hook "23.1")
231
232(defcustom diary-mark-entries-hook nil 211(defcustom diary-mark-entries-hook nil
233 "List of functions called after marking diary entries in the calendar. 212 "List of functions called after marking diary entries in the calendar.
234You might wish to add `diary-mark-included-diary-files', in which case 213You might wish to add `diary-mark-included-diary-files', in which case
@@ -243,9 +222,6 @@ differ only if you are using included diary files. In that case,
243 :options '(diary-mark-included-diary-files) 222 :options '(diary-mark-included-diary-files)
244 :group 'diary) 223 :group 'diary)
245 224
246(define-obsolete-variable-alias 'nongregorian-diary-listing-hook
247 'diary-nongregorian-listing-hook "23.1")
248
249(defcustom diary-nongregorian-listing-hook nil 225(defcustom diary-nongregorian-listing-hook nil
250 "List of functions called for listing diary file and included files. 226 "List of functions called for listing diary file and included files.
251As the files are processed for diary entries, these functions are used 227As the files are processed for diary entries, these functions are used
@@ -263,9 +239,6 @@ use `diary-list-entries-hook', which runs only for the main diary file."
263 diary-islamic-list-entries) 239 diary-islamic-list-entries)
264 :group 'diary) 240 :group 'diary)
265 241
266(define-obsolete-variable-alias 'nongregorian-diary-marking-hook
267 'diary-nongregorian-marking-hook "23.1")
268
269(defcustom diary-nongregorian-marking-hook nil 242(defcustom diary-nongregorian-marking-hook nil
270 "List of functions called for marking diary file and included files. 243 "List of functions called for marking diary file and included files.
271As the files are processed for diary entries, these functions are used 244As the files are processed for diary entries, these functions are used
@@ -283,9 +256,6 @@ use `diary-mark-entries-hook', which runs only for the main diary file."
283 diary-islamic-mark-entries) 256 diary-islamic-mark-entries)
284 :group 'diary) 257 :group 'diary)
285 258
286(define-obsolete-variable-alias 'print-diary-entries-hook
287 'diary-print-entries-hook "23.1")
288
289(defcustom diary-print-entries-hook 'lpr-buffer 259(defcustom diary-print-entries-hook 'lpr-buffer
290 "Run by `diary-print-entries' after preparing a temporary diary buffer. 260 "Run by `diary-print-entries' after preparing a temporary diary buffer.
291The buffer shows only the diary entries currently visible in the 261The buffer shows only the diary entries currently visible in the
@@ -333,9 +303,6 @@ expressions that can involve the keywords `days' (a number), `date'
333 :type 'sexp 303 :type 'sexp
334 :group 'diary) 304 :group 'diary)
335 305
336(define-obsolete-variable-alias 'abbreviated-calendar-year
337 'diary-abbreviated-year-flag "23.1")
338
339(defcustom diary-abbreviated-year-flag t 306(defcustom diary-abbreviated-year-flag t
340 "Interpret a two-digit year DD in a diary entry as either 19DD or 20DD. 307 "Interpret a two-digit year DD in a diary entry as either 19DD or 20DD.
341This applies to the Gregorian, Hebrew, Islamic, and Bahá'í calendars. 308This applies to the Gregorian, Hebrew, Islamic, and Bahá'í calendars.
@@ -484,9 +451,6 @@ just visiting the `diary-file'), and SYMBOL's value is to be changed."
484 ;; Note this assumes diary was called without prefix arg. 451 ;; Note this assumes diary was called without prefix arg.
485 (diary)))) 452 (diary))))
486 453
487(define-obsolete-variable-alias 'number-of-diary-entries
488 'diary-number-of-entries "23.1")
489
490(defcustom diary-number-of-entries 1 454(defcustom diary-number-of-entries 1
491 "Specifies how many days of diary entries are to be displayed initially. 455 "Specifies how many days of diary entries are to be displayed initially.
492This variable affects the diary display when the command \\[diary] is 456This variable affects the diary display when the command \\[diary] is
@@ -562,10 +526,6 @@ DFILE specifies the file to use as the diary file."
562 (let ((diary-file dfile)) 526 (let ((diary-file dfile))
563 (diary-view-entries arg))) 527 (diary-view-entries arg)))
564 528
565;;;###cal-autoload
566(define-obsolete-function-alias 'view-other-diary-entries
567 'diary-view-other-diary-entries "23.1")
568
569(defvar diary-syntax-table 529(defvar diary-syntax-table
570 (let ((st (copy-syntax-table (standard-syntax-table)))) 530 (let ((st (copy-syntax-table (standard-syntax-table))))
571 (modify-syntax-entry ?* "w" st) 531 (modify-syntax-entry ?* "w" st)
@@ -684,8 +644,6 @@ Also removes the region between `diary-comment-start' and
684 (list marker dfile literal) 644 (list marker dfile literal)
685 globcolor))))))) 645 globcolor)))))))
686 646
687(define-obsolete-function-alias 'add-to-diary-list 'diary-add-to-list "23.1")
688
689(defun diary-list-entries-2 (date mark globattr list-only 647(defun diary-list-entries-2 (date mark globattr list-only
690 &optional months symbol gdate) 648 &optional months symbol gdate)
691 "Internal subroutine of `diary-list-entries'. 649 "Internal subroutine of `diary-list-entries'.
@@ -975,9 +933,6 @@ For details, see `diary-include-files'.
975See also `diary-mark-included-diary-files'." 933See also `diary-mark-included-diary-files'."
976 (diary-include-files)) 934 (diary-include-files))
977 935
978(define-obsolete-function-alias 'include-other-diary-files
979 'diary-include-other-diary-files "23.1")
980
981(defvar date-string) ; bound in diary-list-entries 936(defvar date-string) ; bound in diary-list-entries
982 937
983(defun diary-display-no-entries () 938(defun diary-display-no-entries ()
@@ -1036,9 +991,6 @@ in the mode line. This is an option for `diary-display-function'."
1036 (set-window-point window diary-saved-point) 991 (set-window-point window diary-saved-point)
1037 (set-window-start window (point-min))))))) 992 (set-window-start window (point-min)))))))
1038 993
1039(define-obsolete-function-alias 'simple-diary-display
1040 'diary-simple-display "23.1")
1041
1042(defvar diary-goto-entry-function 'diary-goto-entry 994(defvar diary-goto-entry-function 'diary-goto-entry
1043 "Function called to jump to a diary entry. 995 "Function called to jump to a diary entry.
1044Modes that require special handling of the included file 996Modes that require special handling of the included file
@@ -1165,9 +1117,6 @@ This is an option for `diary-display-function'."
1165 (diary-fancy-display-mode)) 1117 (diary-fancy-display-mode))
1166 (calendar-set-mode-line date-string)))) 1118 (calendar-set-mode-line date-string))))
1167 1119
1168(define-obsolete-function-alias 'fancy-diary-display
1169 'diary-fancy-display "23.1")
1170
1171;; FIXME modernize? 1120;; FIXME modernize?
1172(defun diary-print-entries () 1121(defun diary-print-entries ()
1173 "Print a hard copy of the diary display. 1122 "Print a hard copy of the diary display.
@@ -1212,9 +1161,6 @@ the actual printing."
1212 (run-hooks 'diary-print-entries-hook) 1161 (run-hooks 'diary-print-entries-hook)
1213 (kill-buffer temp-buffer)))) 1162 (kill-buffer temp-buffer))))
1214 1163
1215(define-obsolete-function-alias 'print-diary-entries
1216 'diary-print-entries "23.1")
1217
1218;;;###cal-autoload 1164;;;###cal-autoload
1219(defun diary-show-all-entries () 1165(defun diary-show-all-entries ()
1220 "Show all of the diary entries in the diary file. 1166 "Show all of the diary entries in the diary file.
@@ -1462,9 +1408,6 @@ marks. This is intended to deal with deleted diary entries."
1462 (and temp-buff (buffer-name temp-buff) (kill-buffer temp-buff))) 1408 (and temp-buff (buffer-name temp-buff) (kill-buffer temp-buff)))
1463 (or d-incp (message "Marking diary entries...done")))) 1409 (or d-incp (message "Marking diary entries...done"))))
1464 1410
1465;;;###cal-autoload
1466(define-obsolete-function-alias 'mark-diary-entries 'diary-mark-entries "23.1")
1467
1468(defun diary-sexp-entry (sexp entry date) 1411(defun diary-sexp-entry (sexp entry date)
1469 "Process a SEXP diary ENTRY for DATE." 1412 "Process a SEXP diary ENTRY for DATE."
1470 (let ((result (if calendar-debug-sexp 1413 (let ((result (if calendar-debug-sexp
@@ -1542,9 +1485,6 @@ is marked. See the documentation for the function `diary-list-sexp-entries'."
1542 (or (cadr (diary-pull-attrs entry file-glob-attrs)) 1485 (or (cadr (diary-pull-attrs entry file-glob-attrs))
1543 (if (consp mark) (car mark))))))))) 1486 (if (consp mark) (car mark)))))))))
1544 1487
1545(define-obsolete-function-alias 'mark-sexp-diary-entries
1546 'diary-mark-sexp-entries "23.1")
1547
1548(defun diary-mark-included-diary-files () 1488(defun diary-mark-included-diary-files ()
1549 "Mark diary entries from included diary files. 1489 "Mark diary entries from included diary files.
1550To use, add this function to `diary-mark-entries-hook'. 1490To use, add this function to `diary-mark-entries-hook'.
@@ -1552,9 +1492,6 @@ For details, see `diary-include-files'.
1552See also `diary-include-other-diary-files'." 1492See also `diary-include-other-diary-files'."
1553 (diary-include-files t)) 1493 (diary-include-files t))
1554 1494
1555(define-obsolete-function-alias 'mark-included-diary-files
1556 'diary-mark-included-diary-files "23.1")
1557
1558(defun calendar-mark-days-named (dayname &optional color) 1495(defun calendar-mark-days-named (dayname &optional color)
1559 "Mark all dates in the calendar window that are day DAYNAME of the week. 1496 "Mark all dates in the calendar window that are day DAYNAME of the week.
15600 means all Sundays, 1 means all Mondays, and so on. 14970 means all Sundays, 1 means all Mondays, and so on.
@@ -1577,9 +1514,6 @@ Optional argument COLOR is passed to `calendar-mark-visible-date' as MARK."
1577 color) 1514 color)
1578 (setq day (+ day 7)))))) 1515 (setq day (+ day 7))))))
1579 1516
1580(define-obsolete-function-alias 'mark-calendar-days-named
1581 'calendar-mark-days-named "23.1")
1582
1583(defun calendar-mark-month (month year p-month p-day p-year &optional color) 1517(defun calendar-mark-month (month year p-month p-day p-year &optional color)
1584 "Mark dates in the MONTH/YEAR that conform to pattern P-MONTH/P-DAY/P-YEAR. 1518 "Mark dates in the MONTH/YEAR that conform to pattern P-MONTH/P-DAY/P-YEAR.
1585A value of 0 in any position of the pattern is a wildcard. 1519A value of 0 in any position of the pattern is a wildcard.
@@ -1593,9 +1527,6 @@ Optional argument COLOR is passed to `calendar-mark-visible-date' as MARK."
1593 (calendar-mark-visible-date (list month (1+ i) year) color)) 1527 (calendar-mark-visible-date (list month (1+ i) year) color))
1594 (calendar-mark-visible-date (list month p-day year) color)))) 1528 (calendar-mark-visible-date (list month p-day year) color))))
1595 1529
1596(define-obsolete-function-alias 'mark-calendar-month
1597 'calendar-mark-month "23.1")
1598
1599(defun calendar-mark-date-pattern (month day year &optional color) 1530(defun calendar-mark-date-pattern (month day year &optional color)
1600 "Mark all dates in the calendar window that conform to MONTH/DAY/YEAR. 1531 "Mark all dates in the calendar window that conform to MONTH/DAY/YEAR.
1601A value of 0 in any position is a wildcard. Optional argument COLOR is 1532A value of 0 in any position is a wildcard. Optional argument COLOR is
@@ -1608,9 +1539,6 @@ passed to `calendar-mark-visible-date' as MARK."
1608 (calendar-mark-month m y month day year color) 1539 (calendar-mark-month m y month day year color)
1609 (calendar-increment-month m y 1))))) 1540 (calendar-increment-month m y 1)))))
1610 1541
1611(define-obsolete-function-alias 'mark-calendar-date-pattern
1612 'calendar-mark-date-pattern "23.1")
1613
1614;; Bahai, Hebrew, Islamic. 1542;; Bahai, Hebrew, Islamic.
1615(defun calendar-mark-complex (month day year fromabs &optional color) 1543(defun calendar-mark-complex (month day year fromabs &optional color)
1616 "Mark dates in the calendar conforming to MONTH DAY YEAR of some system. 1544 "Mark dates in the calendar conforming to MONTH DAY YEAR of some system.
@@ -1717,8 +1645,6 @@ be the last item in the hook, in case earlier items add diary
1717entries, or change the order." 1645entries, or change the order."
1718 (setq diary-entries-list (sort diary-entries-list 'diary-entry-compare))) 1646 (setq diary-entries-list (sort diary-entries-list 'diary-entry-compare)))
1719 1647
1720(define-obsolete-function-alias 'sort-diary-entries 'diary-sort-entries "23.1")
1721
1722 1648
1723(defun diary-list-sexp-entries (date) 1649(defun diary-list-sexp-entries (date)
1724 "Add sexp entries for DATE from the diary file to `diary-entries-list'. 1650 "Add sexp entries for DATE from the diary file to `diary-entries-list'.
@@ -1877,9 +1803,6 @@ best if they are non-marking."
1877 (setq entry-found (or entry-found diary-entry))) 1803 (setq entry-found (or entry-found diary-entry)))
1878 entry-found)) 1804 entry-found))
1879 1805
1880(define-obsolete-function-alias 'list-sexp-diary-entries
1881 'diary-list-sexp-entries "23.1")
1882
1883(defun diary-make-date (a b c) 1806(defun diary-make-date (a b c)
1884 "Convert A B C into the internal calendar date form. 1807 "Convert A B C into the internal calendar date form.
1885The expected order of the inputs depends on `calendar-date-style', 1808The expected order of the inputs depends on `calendar-date-style',
@@ -2141,9 +2064,6 @@ If omitted, NONMARKING defaults to nil and FILE defaults to
2141 string " ")) 2064 string " "))
2142 2065
2143;;;###cal-autoload 2066;;;###cal-autoload
2144(define-obsolete-function-alias 'make-diary-entry 'diary-make-entry "23.1")
2145
2146;;;###cal-autoload
2147(defun diary-insert-entry (arg &optional event) 2067(defun diary-insert-entry (arg &optional event)
2148 "Insert a diary entry for the date indicated by point. 2068 "Insert a diary entry for the date indicated by point.
2149Prefix argument ARG makes the entry nonmarking." 2069Prefix argument ARG makes the entry nonmarking."
@@ -2153,9 +2073,6 @@ Prefix argument ARG makes the entry nonmarking."
2153 arg)) 2073 arg))
2154 2074
2155;;;###cal-autoload 2075;;;###cal-autoload
2156(define-obsolete-function-alias 'insert-diary-entry 'diary-insert-entry "23.1")
2157
2158;;;###cal-autoload
2159(defun diary-insert-weekly-entry (arg) 2076(defun diary-insert-weekly-entry (arg)
2160 "Insert a weekly diary entry for the day of the week indicated by point. 2077 "Insert a weekly diary entry for the day of the week indicated by point.
2161Prefix argument ARG makes the entry nonmarking." 2078Prefix argument ARG makes the entry nonmarking."
@@ -2163,10 +2080,6 @@ Prefix argument ARG makes the entry nonmarking."
2163 (diary-make-entry (calendar-day-name (calendar-cursor-to-date t)) 2080 (diary-make-entry (calendar-day-name (calendar-cursor-to-date t))
2164 arg)) 2081 arg))
2165 2082
2166;;;###cal-autoload
2167(define-obsolete-function-alias 'insert-weekly-diary-entry
2168 'diary-insert-weekly-entry "23.1")
2169
2170(defun diary-date-display-form (&optional type) 2083(defun diary-date-display-form (&optional type)
2171 "Return value for `calendar-date-display-form' using `calendar-date-style'. 2084 "Return value for `calendar-date-display-form' using `calendar-date-style'.
2172Optional symbol TYPE is either `monthly' or `yearly'." 2085Optional symbol TYPE is either `monthly' or `yearly'."
@@ -2222,10 +2135,6 @@ Prefix argument ARG makes the entry nonmarking."
2222 (diary-insert-entry-1 'monthly arg)) 2135 (diary-insert-entry-1 'monthly arg))
2223 2136
2224;;;###cal-autoload 2137;;;###cal-autoload
2225(define-obsolete-function-alias 'insert-monthly-diary-entry
2226 'diary-insert-monthly-entry "23.1")
2227
2228;;;###cal-autoload
2229(defun diary-insert-yearly-entry (arg) 2138(defun diary-insert-yearly-entry (arg)
2230 "Insert an annual diary entry for the day of the year indicated by point. 2139 "Insert an annual diary entry for the day of the year indicated by point.
2231Prefix argument ARG makes the entry nonmarking." 2140Prefix argument ARG makes the entry nonmarking."
@@ -2233,10 +2142,6 @@ Prefix argument ARG makes the entry nonmarking."
2233 (diary-insert-entry-1 'yearly arg)) 2142 (diary-insert-entry-1 'yearly arg))
2234 2143
2235;;;###cal-autoload 2144;;;###cal-autoload
2236(define-obsolete-function-alias 'insert-yearly-diary-entry
2237 'diary-insert-yearly-entry "23.1")
2238
2239;;;###cal-autoload
2240(defun diary-insert-anniversary-entry (arg) 2145(defun diary-insert-anniversary-entry (arg)
2241 "Insert an anniversary diary entry for the date given by point. 2146 "Insert an anniversary diary entry for the date given by point.
2242Prefix argument ARG makes the entry nonmarking." 2147Prefix argument ARG makes the entry nonmarking."
@@ -2249,10 +2154,6 @@ Prefix argument ARG makes the entry nonmarking."
2249 arg))) 2154 arg)))
2250 2155
2251;;;###cal-autoload 2156;;;###cal-autoload
2252(define-obsolete-function-alias 'insert-anniversary-diary-entry
2253 'diary-insert-anniversary-entry "23.1")
2254
2255;;;###cal-autoload
2256(defun diary-insert-block-entry (arg) 2157(defun diary-insert-block-entry (arg)
2257 "Insert a block diary entry for the days between the point and marked date. 2158 "Insert a block diary entry for the days between the point and marked date.
2258Prefix argument ARG makes the entry nonmarking." 2159Prefix argument ARG makes the entry nonmarking."
@@ -2276,10 +2177,6 @@ Prefix argument ARG makes the entry nonmarking."
2276 arg))) 2177 arg)))
2277 2178
2278;;;###cal-autoload 2179;;;###cal-autoload
2279(define-obsolete-function-alias 'insert-block-diary-entry
2280 'diary-insert-block-entry "23.1")
2281
2282;;;###cal-autoload
2283(defun diary-insert-cyclic-entry (arg) 2180(defun diary-insert-cyclic-entry (arg)
2284 "Insert a cyclic diary entry starting at the date given by point. 2181 "Insert a cyclic diary entry starting at the date given by point.
2285Prefix argument ARG makes the entry nonmarking." 2182Prefix argument ARG makes the entry nonmarking."
@@ -2293,10 +2190,6 @@ Prefix argument ARG makes the entry nonmarking."
2293 (calendar-date-string (calendar-cursor-to-date t) nil t)) 2190 (calendar-date-string (calendar-cursor-to-date t) nil t))
2294 arg))) 2191 arg)))
2295 2192
2296;;;###cal-autoload
2297(define-obsolete-function-alias 'insert-cyclic-diary-entry
2298 'diary-insert-cyclic-entry "23.1")
2299
2300;;; Diary mode. 2193;;; Diary mode.
2301 2194
2302(defun diary-redraw-calendar () 2195(defun diary-redraw-calendar ()
@@ -2357,7 +2250,7 @@ full month names."
2357 (if (equal (car x) 'backup) 2250 (if (equal (car x) 'backup)
2358 (concat "\\)" (eval (car (reverse x)))) 2251 (concat "\\)" (eval (car (reverse x))))
2359 "\\)")) 2252 "\\)"))
2360 '(1 diary-face))) 2253 '(1 'diary)))
2361 diary-date-forms))) 2254 diary-date-forms)))
2362 2255
2363(defmacro diary-font-lock-keywords-1 (markfunc listfunc feature months symbol) 2256(defmacro diary-font-lock-keywords-1 (markfunc listfunc feature months symbol)
@@ -2494,11 +2387,8 @@ This depends on the calendar date style."
2494 (put-text-property (match-beginning 0) (match-end 0) 'font-lock-multiline t) 2387 (put-text-property (match-beginning 0) (match-end 0) 'font-lock-multiline t)
2495 t)) 2388 t))
2496 2389
2497(define-obsolete-variable-alias 'fancy-diary-font-lock-keywords
2498 'diary-fancy-font-lock-keywords "23.1")
2499
2500(defvar diary-fancy-font-lock-keywords 2390(defvar diary-fancy-font-lock-keywords
2501 `((diary-fancy-date-matcher . diary-face) 2391 `((diary-fancy-date-matcher . 'diary)
2502 ("^.*\\([aA]nniversary\\|[bB]irthday\\).*$" . 'diary-anniversary) 2392 ("^.*\\([aA]nniversary\\|[bB]irthday\\).*$" . 'diary-anniversary)
2503 ("^.*Yahrzeit.*$" . font-lock-constant-face) 2393 ("^.*Yahrzeit.*$" . font-lock-constant-face)
2504 ("^\\(Erev \\)?Rosh Hodesh.*" . font-lock-function-name-face) 2394 ("^\\(Erev \\)?Rosh Hodesh.*" . font-lock-function-name-face)
@@ -2545,9 +2435,6 @@ Fontify the region between BEG and END, quietly unless VERBOSE is non-nil."
2545 (list (cons t diary-fancy-overriding-map))) 2435 (list (cons t diary-fancy-overriding-map)))
2546 (view-mode 1)) 2436 (view-mode 1))
2547 2437
2548(define-obsolete-function-alias 'fancy-diary-display-mode
2549 'diary-fancy-display-mode "23.1")
2550
2551;; Following code from Dave Love <fx@gnu.org>. 2438;; Following code from Dave Love <fx@gnu.org>.
2552;; Import Outlook-format appointments from mail messages in Gnus or 2439;; Import Outlook-format appointments from mail messages in Gnus or
2553;; Rmail using command `diary-from-outlook'. This, or the specialized 2440;; Rmail using command `diary-from-outlook'. This, or the specialized
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 488f8cda8f6..d36764a74ce 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -1,7 +1,7 @@
1;;; holidays.el --- holiday functions for the calendar package 1;;; holidays.el --- holiday functions for the calendar package
2 2
3;; Copyright (C) 1989-1990, 1992-1994, 1997, 2001-2014 Free Software 3;; Copyright (C) 1989-1990, 1992-1994, 1997, 2001-2014
4;; Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> 6;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
7;; Maintainer: Glenn Morris <rgm@gnu.org> 7;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -43,9 +43,6 @@
43;; explicitly load this file. 43;; explicitly load this file.
44 44
45;;;###autoload 45;;;###autoload
46(define-obsolete-variable-alias 'general-holidays
47 'holiday-general-holidays "23.1")
48;;;###autoload
49(defcustom holiday-general-holidays 46(defcustom holiday-general-holidays
50 (mapcar 'purecopy 47 (mapcar 'purecopy
51 '((holiday-fixed 1 1 "New Year's Day") 48 '((holiday-fixed 1 1 "New Year's Day")
@@ -73,9 +70,6 @@ See the documentation for `calendar-holidays' for details."
73(put 'holiday-general-holidays 'risky-local-variable t) 70(put 'holiday-general-holidays 'risky-local-variable t)
74 71
75;;;###autoload 72;;;###autoload
76(define-obsolete-variable-alias 'oriental-holidays
77 'holiday-oriental-holidays "23.1")
78;;;###autoload
79(defcustom holiday-oriental-holidays 73(defcustom holiday-oriental-holidays
80 (mapcar 'purecopy 74 (mapcar 'purecopy
81 '((holiday-chinese-new-year) 75 '((holiday-chinese-new-year)
@@ -98,8 +92,6 @@ See the documentation for `calendar-holidays' for details."
98(put 'holiday-oriental-holidays 'risky-local-variable t) 92(put 'holiday-oriental-holidays 'risky-local-variable t)
99 93
100;;;###autoload 94;;;###autoload
101(define-obsolete-variable-alias 'local-holidays 'holiday-local-holidays "23.1")
102;;;###autoload
103(defcustom holiday-local-holidays nil 95(defcustom holiday-local-holidays nil
104 "Local holidays. 96 "Local holidays.
105See the documentation for `calendar-holidays' for details." 97See the documentation for `calendar-holidays' for details."
@@ -109,8 +101,6 @@ See the documentation for `calendar-holidays' for details."
109(put 'holiday-local-holidays 'risky-local-variable t) 101(put 'holiday-local-holidays 'risky-local-variable t)
110 102
111;;;###autoload 103;;;###autoload
112(define-obsolete-variable-alias 'other-holidays 'holiday-other-holidays "23.1")
113;;;###autoload
114(defcustom holiday-other-holidays nil 104(defcustom holiday-other-holidays nil
115 "User defined holidays. 105 "User defined holidays.
116See the documentation for `calendar-holidays' for details." 106See the documentation for `calendar-holidays' for details."
@@ -120,108 +110,6 @@ See the documentation for `calendar-holidays' for details."
120(put 'holiday-other-holidays 'risky-local-variable t) 110(put 'holiday-other-holidays 'risky-local-variable t)
121 111
122;;;###autoload 112;;;###autoload
123(defvar hebrew-holidays-1
124 (mapcar 'purecopy
125 '((holiday-hebrew-rosh-hashanah)
126 (if calendar-hebrew-all-holidays-flag
127 (holiday-julian
128 11
129 (let ((m displayed-month)
130 (y displayed-year)
131 year)
132 (calendar-increment-month m y -1)
133 (setq year (calendar-extract-year
134 (calendar-julian-from-absolute
135 (calendar-absolute-from-gregorian (list m 1 y)))))
136 (if (zerop (% (1+ year) 4))
137 22
138 21)) "\"Tal Umatar\" (evening)"))))
139 "Component of the old default value of `holiday-hebrew-holidays'.")
140;;;###autoload
141(put 'hebrew-holidays-1 'risky-local-variable t)
142(make-obsolete-variable 'hebrew-holidays-1 'hebrew-holidays "23.1")
143
144;;;###autoload
145(defvar hebrew-holidays-2
146 (mapcar 'purecopy
147 '((holiday-hebrew-hanukkah) ; respects calendar-hebrew-all-holidays-flag
148 (if calendar-hebrew-all-holidays-flag
149 (holiday-hebrew
150 10
151 (let ((h-year (calendar-extract-year
152 (calendar-hebrew-from-absolute
153 (calendar-absolute-from-gregorian
154 (list displayed-month 28 displayed-year))))))
155 (if (= 6 (% (calendar-hebrew-to-absolute (list 10 10 h-year))
156 7))
157 11 10))
158 "Tzom Teveth"))
159 (if calendar-hebrew-all-holidays-flag
160 (holiday-hebrew 11 15 "Tu B'Shevat"))))
161 "Component of the old default value of `holiday-hebrew-holidays'.")
162;;;###autoload
163(put 'hebrew-holidays-2 'risky-local-variable t)
164(make-obsolete-variable 'hebrew-holidays-2 'hebrew-holidays "23.1")
165
166;;;###autoload
167(defvar hebrew-holidays-3
168 (mapcar 'purecopy
169 '((if calendar-hebrew-all-holidays-flag
170 (holiday-hebrew
171 11
172 (let* ((m displayed-month)
173 (y displayed-year)
174 (h-year (progn
175 (calendar-increment-month m y 1)
176 (calendar-extract-year
177 (calendar-hebrew-from-absolute
178 (calendar-absolute-from-gregorian
179 (list m (calendar-last-day-of-month m y) y))))))
180 (s-s
181 (calendar-hebrew-from-absolute
182 (if (= 6
183 (% (calendar-hebrew-to-absolute
184 (list 7 1 h-year))
185 7))
186 (calendar-dayname-on-or-before
187 6 (calendar-hebrew-to-absolute
188 (list 11 17 h-year)))
189 (calendar-dayname-on-or-before
190 6 (calendar-hebrew-to-absolute
191 (list 11 16 h-year))))))
192 (day (calendar-extract-day s-s)))
193 day)
194 "Shabbat Shirah"))))
195 "Component of the old default value of `holiday-hebrew-holidays'.")
196;;;###autoload
197(put 'hebrew-holidays-3 'risky-local-variable t)
198(make-obsolete-variable 'hebrew-holidays-3 'hebrew-holidays "23.1")
199
200;;;###autoload
201(defvar hebrew-holidays-4
202 (mapcar 'purecopy
203 '((holiday-hebrew-passover)
204 (and calendar-hebrew-all-holidays-flag
205 (let* ((m displayed-month)
206 (y displayed-year)
207 (year (progn
208 (calendar-increment-month m y -1)
209 (calendar-extract-year
210 (calendar-julian-from-absolute
211 (calendar-absolute-from-gregorian (list m 1 y)))))))
212 (= 21 (% year 28)))
213 (holiday-julian 3 26 "Kiddush HaHamah"))
214 (if calendar-hebrew-all-holidays-flag
215 (holiday-hebrew-tisha-b-av))))
216 "Component of the old default value of `holiday-hebrew-holidays'.")
217;;;###autoload
218(put 'hebrew-holidays-4 'risky-local-variable t)
219(make-obsolete-variable 'hebrew-holidays-4 'hebrew-holidays "23.1")
220
221;;;###autoload
222(define-obsolete-variable-alias 'hebrew-holidays
223 'holiday-hebrew-holidays "23.1")
224;;;###autoload
225(defcustom holiday-hebrew-holidays 113(defcustom holiday-hebrew-holidays
226 (mapcar 'purecopy 114 (mapcar 'purecopy
227 '((holiday-hebrew-passover) 115 '((holiday-hebrew-passover)
@@ -240,9 +128,6 @@ See the documentation for `calendar-holidays' for details."
240(put 'holiday-hebrew-holidays 'risky-local-variable t) 128(put 'holiday-hebrew-holidays 'risky-local-variable t)
241 129
242;;;###autoload 130;;;###autoload
243(define-obsolete-variable-alias 'christian-holidays
244 'holiday-christian-holidays "23.1")
245;;;###autoload
246(defcustom holiday-christian-holidays 131(defcustom holiday-christian-holidays
247 (mapcar 'purecopy 132 (mapcar 'purecopy
248 '((holiday-easter-etc) ; respects calendar-christian-all-holidays-flag 133 '((holiday-easter-etc) ; respects calendar-christian-all-holidays-flag
@@ -262,9 +147,6 @@ See the documentation for `calendar-holidays' for details."
262(put 'holiday-christian-holidays 'risky-local-variable t) 147(put 'holiday-christian-holidays 'risky-local-variable t)
263 148
264;;;###autoload 149;;;###autoload
265(define-obsolete-variable-alias 'islamic-holidays
266 'holiday-islamic-holidays "23.1")
267;;;###autoload
268(defcustom holiday-islamic-holidays 150(defcustom holiday-islamic-holidays
269 (mapcar 'purecopy 151 (mapcar 'purecopy
270 '((holiday-islamic-new-year) 152 '((holiday-islamic-new-year)
@@ -286,8 +168,6 @@ See the documentation for `calendar-holidays' for details."
286(put 'holiday-islamic-holidays 'risky-local-variable t) 168(put 'holiday-islamic-holidays 'risky-local-variable t)
287 169
288;;;###autoload 170;;;###autoload
289(define-obsolete-variable-alias 'bahai-holidays 'holiday-bahai-holidays "23.1")
290;;;###autoload
291(defcustom holiday-bahai-holidays 171(defcustom holiday-bahai-holidays
292 (mapcar 'purecopy 172 (mapcar 'purecopy
293 '((holiday-bahai-new-year) 173 '((holiday-bahai-new-year)
@@ -309,8 +189,6 @@ See the documentation for `calendar-holidays' for details."
309(put 'holiday-bahai-holidays 'risky-local-variable t) 189(put 'holiday-bahai-holidays 'risky-local-variable t)
310 190
311;;;###autoload 191;;;###autoload
312(define-obsolete-variable-alias 'solar-holidays 'holiday-solar-holidays "23.1")
313;;;###autoload
314(defcustom holiday-solar-holidays 192(defcustom holiday-solar-holidays
315 (mapcar 'purecopy 193 (mapcar 'purecopy
316 '((solar-equinoxes-solstices) 194 '((solar-equinoxes-solstices)
@@ -516,9 +394,6 @@ use instead of point."
516 (message "Looking up holidays...done")) 394 (message "Looking up holidays...done"))
517 holiday-list))) 395 holiday-list)))
518 396
519(define-obsolete-function-alias
520 'list-calendar-holidays 'calendar-list-holidays "23.1")
521
522;;;###autoload 397;;;###autoload
523(defun holidays (&optional arg) 398(defun holidays (&optional arg)
524 "Display the holidays for last month, this month, and next month. 399 "Display the holidays for last month, this month, and next month.
@@ -645,9 +520,6 @@ strings describing those holidays that apply on DATE, or nil if none do."
645 (if (calendar-date-equal date (car h)) 520 (if (calendar-date-equal date (car h))
646 (setq holiday-list (append holiday-list (cdr h))))))) 521 (setq holiday-list (append holiday-list (cdr h)))))))
647 522
648(define-obsolete-function-alias
649 'check-calendar-holidays 'calendar-check-holidays "23.1")
650
651 523
652;; Formerly cal-tex-list-holidays. 524;; Formerly cal-tex-list-holidays.
653(defun holiday-in-range (d1 d2) 525(defun holiday-in-range (d1 d2)
@@ -724,9 +596,6 @@ use instead of point."
724 (calendar-mark-visible-date (car holiday) calendar-holiday-marker)) 596 (calendar-mark-visible-date (car holiday) calendar-holiday-marker))
725 (message "Marking holidays...done"))) 597 (message "Marking holidays...done")))
726 598
727(define-obsolete-function-alias
728 'mark-calendar-holidays 'calendar-mark-holidays "23.1")
729
730;; Below are the functions that calculate the dates of holidays; these 599;; Below are the functions that calculate the dates of holidays; these
731;; are eval'ed in the function calendar-holiday-list. If you 600;; are eval'ed in the function calendar-holiday-list. If you
732;; write other such functions, be sure to imitate the style used below. 601;; write other such functions, be sure to imitate the style used below.
@@ -813,9 +682,6 @@ HLIST is a list of elements of the form (DATE) TEXT."
813 (and (car p) (calendar-date-is-visible-p (car p)) p)) 682 (and (car p) (calendar-date-is-visible-p (car p)) p))
814 hlist))) 683 hlist)))
815 684
816(define-obsolete-function-alias
817 'filter-visible-calendar-holidays 'holiday-filter-visible-calendar "23.1")
818
819(defun holiday-sexp (sexp string) 685(defun holiday-sexp (sexp string)
820 "Sexp holiday for dates in the calendar window. 686 "Sexp holiday for dates in the calendar window.
821SEXP is an expression in variable `year' that is evaluated to 687SEXP is an expression in variable `year' that is evaluated to
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index a07fa1ecaf8..43610036861 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -740,16 +740,6 @@ ISO format: (year month day)."
740 ;; datetime == nil 740 ;; datetime == nil
741 nil)) 741 nil))
742 742
743(defun icalendar--date-style ()
744 "Return current calendar date style.
745Convenience function to handle transition from old
746`european-calendar-style' to new `calendar-date-style'."
747 (if (boundp 'calendar-date-style)
748 calendar-date-style
749 (if (with-no-warnings european-calendar-style)
750 'european
751 'american)))
752
753(defun icalendar--datetime-to-diary-date (datetime &optional separator) 743(defun icalendar--datetime-to-diary-date (datetime &optional separator)
754 "Convert the decoded DATETIME to diary format. 744 "Convert the decoded DATETIME to diary format.
755Optional argument SEPARATOR gives the separator between month, 745Optional argument SEPARATOR gives the separator between month,
@@ -757,7 +747,7 @@ day, and year. If nil a blank character is used as separator.
757Call icalendar--datetime-to-*-date according to the current 747Call icalendar--datetime-to-*-date according to the current
758calendar date style." 748calendar date style."
759 (funcall (intern-soft (format "icalendar--datetime-to-%s-date" 749 (funcall (intern-soft (format "icalendar--datetime-to-%s-date"
760 (icalendar--date-style))) 750 calendar-date-style))
761 datetime separator)) 751 datetime separator))
762 752
763(defun icalendar--datetime-to-colontime (datetime) 753(defun icalendar--datetime-to-colontime (datetime)
@@ -867,7 +857,7 @@ is not possible it uses the current calendar date style."
867 (match-end 2)))) 857 (match-end 2))))
868 (setq year (read (substring datestring (match-beginning 3) 858 (setq year (read (substring datestring (match-beginning 3)
869 (match-end 3)))) 859 (match-end 3))))
870 (if (eq (icalendar--date-style) 'american) 860 (if (eq calendar-date-style 'american)
871 (let ((x month)) 861 (let ((x month))
872 (setq month day) 862 (setq month day)
873 (setq day x)))) 863 (setq day x))))
@@ -1451,7 +1441,7 @@ entries. ENTRY-MAIN is the first line of the diary entry."
1451NONMARKER is a regular expression matching the start of non-marking 1441NONMARKER is a regular expression matching the start of non-marking
1452entries. ENTRY-MAIN is the first line of the diary entry." 1442entries. ENTRY-MAIN is the first line of the diary entry."
1453 (if (string-match (concat nonmarker 1443 (if (string-match (concat nonmarker
1454 (if (eq (icalendar--date-style) 'european) 1444 (if (eq calendar-date-style 'european)
1455 "\\([0-9]+[0-9]?\\)\\s-+\\([a-z]+\\)\\s-+" 1445 "\\([0-9]+[0-9]?\\)\\s-+\\([a-z]+\\)\\s-+"
1456 "\\([a-z]+\\)\\s-+\\([0-9]+[0-9]?\\)\\s-+") 1446 "\\([a-z]+\\)\\s-+\\([0-9]+[0-9]?\\)\\s-+")
1457 "\\*?\\s-*" 1447 "\\*?\\s-*"
@@ -1462,8 +1452,8 @@ entries. ENTRY-MAIN is the first line of the diary entry."
1462 "\\s-*\\([^0-9]+.*?\\) ?$" ; must not match years 1452 "\\s-*\\([^0-9]+.*?\\) ?$" ; must not match years
1463 ) 1453 )
1464 entry-main) 1454 entry-main)
1465 (let* ((daypos (if (eq (icalendar--date-style) 'european) 1 2)) 1455 (let* ((daypos (if (eq calendar-date-style 'european) 1 2))
1466 (monpos (if (eq (icalendar--date-style) 'european) 2 1)) 1456 (monpos (if (eq calendar-date-style 'european) 2 1))
1467 (day (read (substring entry-main 1457 (day (read (substring entry-main
1468 (match-beginning daypos) 1458 (match-beginning daypos)
1469 (match-end daypos)))) 1459 (match-end daypos))))
@@ -2300,11 +2290,11 @@ END-T is the event's end time in diary format."
2300 (let ((day (nth 3 dtstart-dec)) 2290 (let ((day (nth 3 dtstart-dec))
2301 (month (nth 4 dtstart-dec))) 2291 (month (nth 4 dtstart-dec)))
2302 (setq result (concat "%%(and (diary-date " 2292 (setq result (concat "%%(and (diary-date "
2303 (cond ((eq (icalendar--date-style) 'iso) 2293 (cond ((eq calendar-date-style 'iso)
2304 (format "t %d %d" month day)) 2294 (format "t %d %d" month day))
2305 ((eq (icalendar--date-style) 'european) 2295 ((eq calendar-date-style 'european)
2306 (format "%d %d t" day month)) 2296 (format "%d %d t" day month))
2307 ((eq (icalendar--date-style) 'american) 2297 ((eq calendar-date-style 'american)
2308 (format "%d %d t" month day))) 2298 (format "%d %d t" month day)))
2309 ") (diary-block " 2299 ") (diary-block "
2310 dtstart-conv 2300 dtstart-conv
@@ -2326,16 +2316,16 @@ END-T is the event's end time in diary format."
2326 (format 2316 (format
2327 "%%%%(and (diary-date %s) (diary-block %s %s)) %s%s%s" 2317 "%%%%(and (diary-date %s) (diary-block %s %s)) %s%s%s"
2328 (let ((day (nth 3 dtstart-dec))) 2318 (let ((day (nth 3 dtstart-dec)))
2329 (cond ((eq (icalendar--date-style) 'iso) 2319 (cond ((eq calendar-date-style 'iso)
2330 (format "t t %d" day)) 2320 (format "t t %d" day))
2331 ((eq (icalendar--date-style) 'european) 2321 ((eq calendar-date-style 'european)
2332 (format "%d t t" day)) 2322 (format "%d t t" day))
2333 ((eq (icalendar--date-style) 'american) 2323 ((eq calendar-date-style 'american)
2334 (format "t %d t" day)))) 2324 (format "t %d t" day))))
2335 dtstart-conv 2325 dtstart-conv
2336 (if until 2326 (if until
2337 until-conv 2327 until-conv
2338 (if (eq (icalendar--date-style) 'iso) "9999 1 1" "1 1 9999")) ;; FIXME: should be unlimited 2328 (if (eq calendar-date-style 'iso) "9999 1 1" "1 1 9999")) ;; FIXME: should be unlimited
2339 (or start-t "") 2329 (or start-t "")
2340 (if end-t "-" "") (or end-t "")))) 2330 (if end-t "-" "") (or end-t ""))))
2341 ;; daily 2331 ;; daily
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index e429bb03d15..0b20006f953 100644
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -1,7 +1,6 @@
1;;; lunar.el --- calendar functions for phases of the moon 1;;; lunar.el --- calendar functions for phases of the moon
2 2
3;; Copyright (C) 1992-1993, 1995, 1997, 2001-2014 Free Software 3;; Copyright (C) 1992-1993, 1995, 1997, 2001-2014 Free Software Foundation, Inc.
4;; Foundation, Inc.
5 4
6;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> 5;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
7;; Maintainer: Glenn Morris <rgm@gnu.org> 6;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -228,10 +227,6 @@ use instead of point."
228 (lunar-phase-list m1 y1) "\n"))) 227 (lunar-phase-list m1 y1) "\n")))
229 (message "Computing phases of the moon...done")))) 228 (message "Computing phases of the moon...done"))))
230 229
231;;;###cal-autoload
232(define-obsolete-function-alias 'calendar-phases-of-moon
233 'calendar-lunar-phases "23.1")
234
235;;;###autoload 230;;;###autoload
236(defun lunar-phases (&optional arg) 231(defun lunar-phases (&optional arg)
237 "Display the quarters of the moon for last month, this month, and next month. 232 "Display the quarters of the moon for last month, this month, and next month.
@@ -245,9 +240,6 @@ This function is suitable for execution in an init file."
245 (displayed-year (calendar-extract-year date))) 240 (displayed-year (calendar-extract-year date)))
246 (calendar-lunar-phases)))) 241 (calendar-lunar-phases))))
247 242
248;;;###autoload
249(define-obsolete-function-alias 'phases-of-moon 'lunar-phases "23.1")
250
251(defvar date) 243(defvar date)
252 244
253;; To be called from diary-list-sexp-entries, where DATE is bound. 245;; To be called from diary-list-sexp-entries, where DATE is bound.
@@ -266,10 +258,6 @@ use when highlighting the day in the calendar."
266 (cons mark (concat (lunar-phase-name (nth 2 phase)) " " 258 (cons mark (concat (lunar-phase-name (nth 2 phase)) " "
267 (cadr phase)))))) 259 (cadr phase))))))
268 260
269;;;###diary-autoload
270(define-obsolete-function-alias 'diary-phases-of-moon
271 'diary-lunar-phases "23.1")
272
273;; For the Chinese calendar the calculations for the new moon need to be more 261;; For the Chinese calendar the calculations for the new moon need to be more
274;; accurate than those above, so we use more terms in the approximation. 262;; accurate than those above, so we use more terms in the approximation.
275(defun lunar-new-moon-time (k) 263(defun lunar-new-moon-time (k)
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 089f5b2d889..95b947481b5 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -499,6 +499,8 @@ If this is nil, then `diary-file' will be used instead."
499 :type '(choice (const :tag "diary-file" nil) file) 499 :type '(choice (const :tag "diary-file" nil) file)
500 :group 'remember) 500 :group 'remember)
501 501
502(defvar calendar-date-style) ; calendar.el
503
502(defun remember-diary-convert-entry (entry) 504(defun remember-diary-convert-entry (entry)
503 "Translate MSG to an entry readable by diary." 505 "Translate MSG to an entry readable by diary."
504 (save-match-data 506 (save-match-data
@@ -511,23 +513,17 @@ If this is nil, then `diary-file' will be used instead."
511 ;; which requires calendar. 513 ;; which requires calendar.
512 (require 'calendar) 514 (require 'calendar)
513 (replace-match 515 (replace-match
514 (let ((style (if (boundp 'calendar-date-style) 516 (cond ((eq calendar-date-style 'european)
515 calendar-date-style 517 (concat (match-string 3 entry) "/"
516 ;; Don't complain about obsolescence. 518 (match-string 2 entry) "/"
517 (if (with-no-warnings european-calendar-style) 519 (match-string 1 entry)))
518 'european 520 ((eq calendar-date-style 'iso)
519 'american)))) 521 (concat (match-string 1 entry) "-"
520 (cond ((eq style 'european)
521 (concat (match-string 3 entry) "/"
522 (match-string 2 entry) "/"
523 (match-string 1 entry)))
524 ((eq style 'iso)
525 (concat (match-string 1 entry) "-"
526 (match-string 2 entry) "-" 522 (match-string 2 entry) "-"
527 (match-string 3 entry))) 523 (match-string 3 entry)))
528 (t (concat (match-string 2 entry) "/" 524 (t (concat (match-string 2 entry) "/"
529 (match-string 3 entry) "/" 525 (match-string 3 entry) "/"
530 (match-string 1 entry))))) 526 (match-string 1 entry))))
531 t t entry)) 527 t t entry))
532 entry))) 528 entry)))
533 529
diff --git a/test/ChangeLog b/test/ChangeLog
index 57615c486fc..3d930be56c1 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
12014-10-06 Glenn Morris <rgm@gnu.org>
2
3 * automated/icalendar-tests.el (icalendar--calendar-style):
4 Remove test, no longer relevant.
5
12014-10-04 Glenn Morris <rgm@gnu.org> 62014-10-04 Glenn Morris <rgm@gnu.org>
2 7
3 * automated/package-x-test.el: Remove file... 8 * automated/package-x-test.el: Remove file...
diff --git a/test/automated/icalendar-tests.el b/test/automated/icalendar-tests.el
index 9598e89ca22..a6a5da2ff57 100644
--- a/test/automated/icalendar-tests.el
+++ b/test/automated/icalendar-tests.el
@@ -80,18 +80,6 @@
80 (should (string= (concat "yyyDTSTARTyyy") 80 (should (string= (concat "yyyDTSTARTyyy")
81 (icalendar--create-uid entry-full contents))))) 81 (icalendar--create-uid entry-full contents)))))
82 82
83(ert-deftest icalendar--calendar-style ()
84 "Test for `icalendar--date-style'."
85 (dolist (calendar-date-style '(iso american european))
86 (should (eq (icalendar--date-style) calendar-date-style)))
87 (let ((cds calendar-date-style)
88 (european-calendar-style t))
89 (makunbound 'calendar-date-style)
90 (should (eq (icalendar--date-style) 'european))
91 (with-no-warnings (setq european-calendar-style nil)) ;still get warning!?! FIXME
92 (should (eq (icalendar--date-style) 'american))
93 (setq calendar-date-style cds)))
94
95(ert-deftest icalendar-convert-anniversary-to-ical () 83(ert-deftest icalendar-convert-anniversary-to-ical ()
96 "Test method for `icalendar--convert-anniversary-to-ical'." 84 "Test method for `icalendar--convert-anniversary-to-ical'."
97 (let* ((calendar-date-style 'iso) 85 (let* ((calendar-date-style 'iso)
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-30 19:21:27 +0000