Commit 3f659704 authored by Glenn Morris's avatar Glenn Morris

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.
parent 918b5def
......@@ -143,11 +143,26 @@ appending FUN to `minibuffer-setup-hook'.
`diary-chinese-insert-monthly-entry', `diary-chinese-insert-yearly-entry'.
+++
*** Calendar can list and mark diary entries with Chinese dates.
*** The calendar can now list and mark diary entries with Chinese dates.
See `diary-chinese-list-entries' and `diary-chinese-mark-entries'.
*** The mode line of the calendar buffer will not be modified if
`calendar-mode-line-format' is nil.
---
*** The option `calendar-mode-line-format' can now be nil,
which means to do nothing special with the mode line in calendars.
---
*** Many items obsolete since at least version 23.1 have been removed.
The majority were function/variable/face aliases, too numerous to list here.
The remainder were:
**** Functions `calendar-one-frame-setup', `calendar-only-one-frame-setup',
`calendar-two-frame-setup', `european-calendar', `american-calendar'.
**** Hooks `cal-menu-load-hook', `cal-x-load-hook'.
**** Macro `calendar-for-loop'.
**** Variables `european-calendar-style', `diary-face', `hebrew-holidays-{1,4}'.
** New ERT function `ert-summarize-tests-batch-and-exit'.
......
2014-10-06 Glenn Morris <rgm@gnu.org>
Remove calendar code obsolete since at least version 23.1.
* 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):
* 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):
* 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):
* calendar/cal-french.el (calendar-absolute-from-french)
(calendar-print-french-date, calendar-goto-french-date):
* 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):
* 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):
* calendar/cal-iso.el (calendar-absolute-from-iso)
(calendar-print-iso-date, calendar-iso-read-args)
(calendar-goto-iso-date, calendar-goto-iso-week):
* 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):
* 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):
* calendar/cal-move.el (scroll-calendar-left)
(scroll-calendar-right, scroll-calendar-left-three-months)
(scroll-calendar-right-three-months):
* calendar/cal-persia.el (calendar-absolute-from-persian)
(calendar-print-persian-date, persian-prompt-for-date)
(calendar-goto-persian-date):
* calendar/cal-x.el (calendar-after-frame-setup-hooks):
* 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):
* 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):
* 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):
* calendar/lunar.el (calendar-phases-of-moon, phases-of-moon)
(diary-phases-of-moon): Remove obsolete aliases.
* 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.
* calendar/icalendar.el (icalendar--date-style): Remove function.
Replace all uses with calendar-date-style.
* textmodes/remember.el (calendar-date-style): Declare.
(remember-diary-convert-entry):
No longer consult european-calendar-style.
2014-10-05 Leo Liu <sdl.web@gmail.com>
* imenu.el (imenu-default-goto-function): Fix typo.
......
......@@ -94,9 +94,6 @@ Gregorian date Sunday, December 31, 1 BC."
0)
day))) ; days so far this month
(define-obsolete-function-alias 'calendar-absolute-from-bahai
'calendar-bahai-to-absolute "23.1")
(defun calendar-bahai-from-absolute (date)
"Bahá'í date (month day year) corresponding to the absolute DATE."
(if (< date calendar-bahai-epoch)
......@@ -152,9 +149,6 @@ Defaults to today's date if DATE is not given."
(message "Date is pre-Bahá'í")
(message "Bahá'í date: %s" s))))
(define-obsolete-function-alias
'calendar-print-bahai-date 'calendar-bahai-print-date "23.1")
(defun calendar-bahai-read-date ()
"Interactively read the arguments for a Bahá'í date command.
Reads a year, month and day."
......@@ -179,9 +173,6 @@ Reads a year, month and day."
(lambda (x) (and (< 0 x) (<= x 19))))))
(list (list month day year))))
(define-obsolete-function-alias
'calendar-bahai-prompt-for-date 'calendar-bahai-read-date "23.1")
;;;###cal-autoload
(defun calendar-bahai-goto-date (date &optional noecho)
"Move cursor to Bahá'í date DATE; echo Bahá'í date unless NOECHO is non-nil."
......@@ -190,9 +181,6 @@ Reads a year, month and day."
(calendar-bahai-to-absolute date)))
(or noecho (calendar-bahai-print-date)))
(define-obsolete-function-alias
'calendar-goto-bahai-date 'calendar-bahai-goto-date "23.1")
(defvar displayed-month)
(defvar displayed-year)
......@@ -270,9 +258,6 @@ will not be marked in the calendar. This function is provided for use with
(diary-list-entries-1 calendar-bahai-month-name-array
diary-bahai-entry-symbol
'calendar-bahai-from-absolute))
(define-obsolete-function-alias
'list-bahai-diary-entries 'diary-bahai-list-entries "23.1")
(autoload 'calendar-mark-1 "diary-lib")
......@@ -284,10 +269,6 @@ passed to `calendar-mark-visible-date' as MARK."
(calendar-mark-1 month day year 'calendar-bahai-from-absolute
'calendar-bahai-to-absolute color))
(define-obsolete-function-alias
'mark-bahai-calendar-date-pattern 'calendar-bahai-mark-date-pattern "23.1")
(autoload 'diary-mark-entries-1 "diary-lib")
;;;###diary-autoload
......@@ -300,10 +281,6 @@ window. See `diary-bahai-list-entries' for more information."
diary-bahai-entry-symbol
'calendar-bahai-from-absolute))
(define-obsolete-function-alias
'mark-bahai-diary-entries 'diary-bahai-mark-entries "23.1")
(autoload 'diary-insert-entry-1 "diary-lib")
;;;###cal-autoload
......@@ -316,9 +293,6 @@ Prefix argument ARG makes the entry nonmarking."
diary-bahai-entry-symbol
'calendar-bahai-from-absolute))
(define-obsolete-function-alias
'insert-bahai-diary-entry 'diary-bahai-insert-entry "23.1")
;;;###cal-autoload
(defun diary-bahai-insert-monthly-entry (arg)
"Insert a monthly diary entry.
......@@ -329,9 +303,6 @@ Prefix argument ARG makes the entry nonmarking."
diary-bahai-entry-symbol
'calendar-bahai-from-absolute))
(define-obsolete-function-alias
'insert-monthly-bahai-diary-entry 'diary-bahai-insert-monthly-entry "23.1")
;;;###cal-autoload
(defun diary-bahai-insert-yearly-entry (arg)
"Insert an annual diary entry.
......@@ -342,9 +313,6 @@ Prefix argument ARG will make the entry nonmarking."
diary-bahai-entry-symbol
'calendar-bahai-from-absolute))
(define-obsolete-function-alias
'insert-yearly-bahai-diary-entry 'diary-bahai-insert-yearly-entry "23.1")
(defvar date)
;; To be called from diary-list-sexp-entries, where DATE is bound.
......
......@@ -58,9 +58,6 @@
:prefix "calendar-chinese-"
:group 'calendar)
(define-obsolete-variable-alias 'chinese-calendar-time-zone
'calendar-chinese-time-zone "23.1")
(defcustom calendar-chinese-time-zone
'(if (< year 1928)
(+ 465 (/ 40.0 60.0))
......@@ -78,18 +75,12 @@ Default is for Beijing. This is an expression in `year' since it changed at
(put 'chinese-calendar-time-zone 'risky-local-variable t)
(define-obsolete-variable-alias 'chinese-calendar-location-name
'calendar-chinese-location-name "23.1")
;; FIXME unused.
(defcustom calendar-chinese-location-name "Beijing"
"Name of location used for calculation of Chinese calendar."
:type 'string
:group 'calendar-chinese)
(define-obsolete-variable-alias 'chinese-calendar-daylight-time-offset
'calendar-chinese-daylight-time-offset "23.1")
(defcustom calendar-chinese-daylight-time-offset 0
;; The correct value is as follows, but the Chinese calendrical
;; authorities do NOT use DST in determining astronomical events:
......@@ -99,9 +90,6 @@ Default is for no daylight saving time."
:type 'integer
:group 'calendar-chinese)
(define-obsolete-variable-alias 'chinese-calendar-standard-time-zone-name
'calendar-chinese-standard-time-zone-name "23.1")
(defcustom calendar-chinese-standard-time-zone-name
'(if (< year 1928)
"PMT"
......@@ -112,17 +100,11 @@ at 1928-01-01 00:00:00 from `PMT' to `CST'."
:type 'sexp
:group 'calendar-chinese)
(define-obsolete-variable-alias 'chinese-calendar-daylight-time-zone-name
'calendar-chinese-daylight-time-zone-name "23.1")
(defcustom calendar-chinese-daylight-time-zone-name "CDT"
"Abbreviated name of daylight saving time zone used for Chinese calendar."
:type 'string
:group 'calendar-chinese)
(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-starts
'calendar-chinese-daylight-saving-start "23.1")
(defcustom calendar-chinese-daylight-saving-start nil
;; The correct value is as follows, but the Chinese calendrical
;; authorities do NOT use DST in determining astronomical events:
......@@ -135,9 +117,6 @@ Default is for no daylight saving time. See documentation of
:type 'sexp
:group 'calendar-chinese)
(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-ends
'calendar-chinese-daylight-saving-end "23.1")
(defcustom calendar-chinese-daylight-saving-end nil
;; The correct value is as follows, but the Chinese calendrical
;; authorities do NOT use DST in determining astronomical events:
......@@ -148,27 +127,18 @@ Default is for no daylight saving time. See documentation of
:type 'sexp
:group 'calendar-chinese)
(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-starts-time
'calendar-chinese-daylight-saving-start-time "23.1")
(defcustom calendar-chinese-daylight-saving-start-time 0
"Number of minutes after midnight that daylight saving time starts.
Default is for no daylight saving time."
:type 'integer
:group 'calendar-chinese)
(define-obsolete-variable-alias 'chinese-calendar-daylight-savings-ends-time
'calendar-chinese-daylight-saving-end-time "23.1")
(defcustom calendar-chinese-daylight-saving-end-time 0
"Number of minutes after midnight that daylight saving time ends.
Default is for no daylight saving time."
:type 'integer
:group 'calendar-chinese)
(define-obsolete-variable-alias 'chinese-calendar-celestial-stem
'calendar-chinese-celestial-stem "23.1")
(defcustom calendar-chinese-celestial-stem
["Jia" "Yi" "Bing" "Ding" "Wu" "Ji" "Geng" "Xin" "Ren" "Gui"]
"Prefixes used by `calendar-chinese-sexagesimal-name'."
......@@ -184,9 +154,6 @@ Default is for no daylight saving time."
(string :tag "Ren")
(string :tag "Gui")))
(define-obsolete-variable-alias 'chinese-calendar-terrestrial-branch
'calendar-chinese-terrestrial-branch "23.1")
(defcustom calendar-chinese-terrestrial-branch
["Zi" "Chou" "Yin" "Mao" "Chen" "Si" "Wu" "Wei" "Shen" "You" "Xu" "Hai"]
"Suffixes used by `calendar-chinese-sexagesimal-name'."
......@@ -432,9 +399,6 @@ Sunday, December 31, 1 BC is imaginary."
(calendar-chinese-year g-year))
(calendar-chinese-year (1+ g-year))))))))
(define-obsolete-function-alias 'calendar-absolute-from-chinese
'calendar-chinese-to-absolute "23.1")
(defun calendar-chinese-from-absolute (date)
"Compute Chinese date (cycle year month day) corresponding to absolute DATE.
The 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."
(message "Chinese date: %s"
(calendar-chinese-date-string (calendar-cursor-to-date t))))
(define-obsolete-function-alias 'calendar-print-chinese-date
'calendar-chinese-print-date "23.1")
(defun calendar-chinese-months-to-alist (l)
"Make list of months L into an assoc list."
(and l (car l)
......@@ -671,9 +632,6 @@ Echo Chinese date unless NOECHO is non-nil."
(calendar-chinese-to-absolute date)))
(or noecho (calendar-chinese-print-date)))
(define-obsolete-function-alias 'calendar-goto-chinese-date
'calendar-chinese-goto-date "23.1")
(defvar date)
;; To be called from diary-list-sexp-entries, where DATE is bound.
......
......@@ -75,9 +75,6 @@ Gregorian date Sunday, December 31, 1 BC."
(* 30 (1- month)) ; days in prior months this year
day))) ; days so far this month
(define-obsolete-function-alias 'calendar-absolute-from-coptic
'calendar-coptic-to-absolute "23.1")
(defun calendar-coptic-from-absolute (date)
"Compute the Coptic equivalent for absolute date DATE.
The result is a list of the form (MONTH DAY YEAR).
......@@ -135,9 +132,6 @@ Defaults to today's date if DATE is not given."
(message "Date is pre-%s calendar" calendar-coptic-name)
(message "%s date: %s" calendar-coptic-name f))))
(define-obsolete-function-alias 'calendar-print-coptic-date
'calendar-coptic-print-date "23.1")
(defun calendar-coptic-read-date ()
"Interactively read the arguments for a Coptic date command.
Reads a year, month, and day."
......@@ -164,9 +158,6 @@ Reads a year, month, and day."
(lambda (x) (and (< 0 x) (<= x last))))))
(list (list month day year))))
(define-obsolete-function-alias 'coptic-prompt-for-date
'calendar-coptic-read-date "23.1")
;;;###cal-autoload
(defun calendar-coptic-goto-date (date &optional noecho)
"Move cursor to Coptic date DATE.
......@@ -176,8 +167,6 @@ Echo Coptic date unless NOECHO is t."
(calendar-coptic-to-absolute date)))
(or noecho (calendar-coptic-print-date)))
(define-obsolete-function-alias 'calendar-goto-coptic-date
'calendar-coptic-goto-date "23.1")
(defvar date)
......@@ -208,9 +197,6 @@ Gregorian date Sunday, December 31, 1 BC."
(let ((calendar-coptic-epoch calendar-ethiopic-epoch))
(calendar-coptic-to-absolute date)))
(define-obsolete-function-alias 'calendar-absolute-from-ethiopic
'calendar-ethiopic-to-absolute "23.1")
(defun calendar-ethiopic-from-absolute (date)
"Compute the Ethiopic equivalent for absolute date DATE.
The result is a list of the form (MONTH DAY YEAR).
......@@ -238,9 +224,6 @@ Defaults to today's date if DATE is not given."
(calendar-coptic-month-name-array calendar-ethiopic-month-name-array))
(call-interactively 'calendar-coptic-print-date)))
(define-obsolete-function-alias 'calendar-print-ethiopic-date
'calendar-ethiopic-print-date "23.1")
;;;###cal-autoload
(defun calendar-ethiopic-goto-date (date &optional noecho)
"Move cursor to Ethiopic date DATE.
......@@ -254,9 +237,6 @@ Echo Ethiopic date unless NOECHO is t."
(calendar-ethiopic-to-absolute date)))
(or noecho (calendar-ethiopic-print-date)))
(define-obsolete-function-alias 'calendar-goto-ethiopic-date
'calendar-ethiopic-goto-date "23.1")
;; To be called from diary-list-sexp-entries, where DATE is bound.
;;;###diary-autoload
(defun diary-ethiopic-date ()
......
;;; cal-french.el --- calendar functions for the French Revolutionary calendar
;; Copyright (C) 1988-1989, 1992, 1994-1995, 1997, 2001-2014 Free
;; Software Foundation, Inc.
;; Copyright (C) 1988-1989, 1992, 1994-1995, 1997, 2001-2014
;; Free Software Foundation, Inc.
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <rgm@gnu.org>
......@@ -129,9 +129,6 @@ Gregorian date Sunday, December 31, 1 BC."
day ; days so far this month
(1- calendar-french-epoch)))) ; days before start of calendar
(define-obsolete-function-alias 'calendar-absolute-from-french
'calendar-french-to-absolute "23.1")
(defun calendar-french-from-absolute (date)
"Compute the French Revolutionary equivalent for absolute date DATE.
The result is a list of the form (MONTH DAY YEAR).
......@@ -196,9 +193,6 @@ Defaults to today's date if DATE is not given."
(message "Date is pre-French Revolution")
(message "French Revolutionary date: %s" f))))
(define-obsolete-function-alias 'calendar-print-french-date
'calendar-french-print-date "23.1")
;;;###cal-autoload
(defun calendar-french-goto-date (date &optional noecho)
"Move cursor to French Revolutionary date DATE.
......@@ -249,9 +243,6 @@ Echo French Revolutionary date unless NOECHO is non-nil."
(calendar-french-to-absolute date)))
(or noecho (calendar-french-print-date)))
(define-obsolete-function-alias 'calendar-goto-french-date
'calendar-french-goto-date "23.1")
(defvar date)
;; To be called from diary-list-sexp-entries, where DATE is bound.
......
......@@ -32,9 +32,6 @@
(require 'calendar)
(define-obsolete-variable-alias 'diary-sabbath-candles-minutes
'diary-hebrew-sabbath-candles-minutes "23.1")
(defcustom diary-hebrew-sabbath-candles-minutes 18
"Number of minutes before sunset for sabbath candle lighting.
Used by `diary-hebrew-sabbath-candles'."
......@@ -136,9 +133,6 @@ Gregorian date Sunday, December 31, 1 BC."
(calendar-hebrew-elapsed-days year) ; days in prior years
-1373429))) ; days elapsed before absolute date 1
(define-obsolete-function-alias 'calendar-absolute-from-hebrew
'calendar-hebrew-to-absolute "23.1")
(defun calendar-hebrew-from-absolute (date)
"Compute the Hebrew date (month day year) corresponding to absolute DATE.
The absolute date is the number of days elapsed since the (imaginary)
......@@ -194,9 +188,6 @@ Driven by the variable `calendar-date-display-form'."
(message "Hebrew date (until sunset): %s"
(calendar-hebrew-date-string (calendar-cursor-to-date t))))
(define-obsolete-function-alias 'calendar-print-hebrew-date
'calendar-hebrew-print-date "23.1")
(defun calendar-hebrew-yahrzeit (death-date year)
"Absolute date of the anniversary of Hebrew DEATH-DATE in Hebrew YEAR."
(let ((death-day (calendar-extract-day death-date))
......@@ -230,9 +221,6 @@ Driven by the variable `calendar-date-display-form'."
(t (calendar-hebrew-to-absolute
(list death-month death-day year))))))
(define-obsolete-function-alias 'hebrew-calendar-yahrzeit
'calendar-hebrew-yahrzeit "23.1")
(defun calendar-hebrew-read-date ()
"Interactively read the arguments for a Hebrew date command.
Reads a year, month, and day."
......@@ -284,9 +272,6 @@ Reads a year, month, and day."
(calendar-hebrew-to-absolute date)))
(or noecho (calendar-hebrew-print-date)))
(define-obsolete-function-alias 'calendar-goto-hebrew-date
'calendar-hebrew-goto-date "23.1")
(defvar displayed-month) ; from calendar-generate
(defun calendar-hebrew-date-is-visible-p (month day)
......@@ -397,10 +382,6 @@ or ALL is non-nil."
(list (calendar-gregorian-from-absolute (+ abs-r-h 20))
"Hoshanah Rabbah"))))))))
;;;###holiday-autoload
(define-obsolete-function-alias 'holiday-rosh-hashanah-etc
'holiday-hebrew-rosh-hashanah "23.1")
;;;###holiday-autoload
(defun holiday-hebrew-hanukkah (&optional all)
"List of dates related to Hanukkah, as visible in calendar window.
......@@ -433,10 +414,6 @@ is non-nil."
han)))
(list (list (calendar-gregorian-from-absolute abs-h) "Hanukkah")))))))
;;;###holiday-autoload
(define-obsolete-function-alias 'holiday-hanukkah
'holiday-hebrew-hanukkah "23.1")
;;;###holiday-autoload
(defun holiday-hebrew-passover (&optional all)
"List of dates related to Passover, as visible in calendar window.
......@@ -519,10 +496,6 @@ or ALL is non-nil."
(list (calendar-gregorian-from-absolute (+ abs-p 51))
"Shavuot (second day)")))))))))
;;;###holiday-autoload
(define-obsolete-function-alias 'holiday-passover-etc
'holiday-hebrew-passover "23.1")
;;;###holiday-autoload
(defun holiday-hebrew-tisha-b-av ()
"List of dates around Tisha B'Av, as visible in calendar window."
......@@ -545,10 +518,6 @@ or ALL is non-nil."
(calendar-dayname-on-or-before 6 (+ abs-t-a 7)))
"Shabbat Nahamu"))))))
;;;###holiday-autoload
(define-obsolete-function-alias 'holiday-tisha-b-av-etc
'holiday-hebrew-tisha-b-av "23.1")
(autoload 'holiday-julian "cal-julian")
;;;###holiday-autoload
......@@ -634,9 +603,6 @@ is provided for use with `diary-nongregorian-listing-hook'."
(diary-list-entries-1 calendar-hebrew-month-name-array-leap-year
diary-hebrew-entry-symbol
'calendar-hebrew-from-absolute))
;;;###diary-autoload
(define-obsolete-function-alias 'list-hebrew-diary-entries
'diary-hebrew-list-entries "23.1")
(autoload 'calendar-mark-complex "diary-lib")
......@@ -662,10 +628,6 @@ passed to `calendar-mark-visible-date' as MARK."
(calendar-mark-complex month day year
'calendar-hebrew-from-absolute color))))
;;;###diary-autoload
(define-obsolete-function-alias 'mark-hebrew-calendar-date-pattern
'calendar-hebrew-mark-date-pattern "23.1")
(autoload 'diary-mark-entries-1 "diary-lib")
;;;###diary-autoload
......@@ -678,10 +640,6 @@ window. See `list-hebrew-diary-entries' for more information."
diary-hebrew-entry-symbol
'calendar-hebrew-from-absolute))
;;;###diary-autoload
(define-obsolete-function-alias 'mark-hebrew-diary-entries
'diary-hebrew-mark-entries "23.1")
(autoload 'diary-insert-entry-1 "diary-lib")
;;;###cal-autoload
......@@ -693,10 +651,6 @@ Prefix argument ARG makes the entry nonmarking."
diary-hebrew-entry-symbol
'calendar-hebrew-from-absolute))
;;;###diary-autoload
(define-obsolete-function-alias 'insert-hebrew-diary-entry
'diary-hebrew-insert-entry "23.1")
;;;###cal-autoload
(defun diary-hebrew-insert-monthly-entry (arg)
"Insert a monthly diary entry.
......@@ -706,9 +660,6 @@ Prefix argument ARG makes the entry nonmarking."
(diary-insert-entry-1 'monthly arg calendar-hebrew-month-name-array-leap-year
diary-hebrew-entry-symbol
'calendar-hebrew-from-absolute))
;;;###diary-autoload
(define-obsolete-function-alias 'insert-monthly-hebrew-diary-entry
'diary-hebrew-insert-monthly-entry "23.1")
;;;###cal-autoload
(defun diary-hebrew-insert-yearly-entry (arg)
......@@ -719,9 +670,6 @@ Prefix argument ARG makes the entry nonmarking."
(diary-insert-entry-1 'yearly arg calendar-hebrew-month-name-array-leap-year
diary-hebrew-entry-symbol
'calendar-hebrew-from-absolute))
;;;###diary-autoload
(define-obsolete-function-alias 'insert-yearly-hebrew-diary-entry
'diary-hebrew-insert-yearly-entry "23.1")
;;;###autoload
(defun calendar-hebrew-list-yahrzeits (death-date start-year end-year)
......@@ -786,10 +734,6 @@ from the cursor position."
(calendar-absolute-from-gregorian (list 1 1 i))))))) "\n"))))
(message "Computing Yahrzeits...done"))
;;;###autoload
(define-obsolete-function-alias 'list-yahrzeit-dates
'calendar-hebrew-list-yahrzeits "23.1")
(defun calendar-hebrew-birthday (date year)
"Absolute date of the anniversary of Hebrew birth DATE, in Hebrew YEAR."
(let ((b-day (calendar-extract-day date))
......@@ -869,8 +813,6 @@ use when highlighting the day in the calendar."
""
(format " and %d day%s"
day (if (= day 1) "" "s"))))))))))
;;;###diary-autoload
(define-obsolete-function-alias 'diary-omer 'diary-hebrew-omer "23.1")
(autoload 'diary-make-date "diary-lib")