procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove calendar code obsolete since at least version 23.1

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2014-10-05 19:02:04 -07:00
parent 918b5def3f
commit 3f65970414
23 changed files with 181 additions and 774 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
etc/NEWS
View file

@ -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'.

127
lisp/ChangeLog
View file

@ -1,3 +1,130 @@
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.

32
lisp/calendar/cal-bahai.el
View file

@ -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.

42
lisp/calendar/cal-china.el
View file

@ -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.

20
lisp/calendar/cal-coptic.el
View file

@ -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 ()

13
lisp/calendar/cal-french.el
View file

@ -1,7 +1,7 @@
;;; 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.

70
lisp/calendar/cal-hebrew.el
View file

@ -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")
@ -911,9 +853,6 @@ use when highlighting the day in the calendar."
diff
(diary-ordinal-suffix diff))))))
;;;###diary-autoload
(define-obsolete-function-alias 'diary-yahrzeit 'diary-hebrew-yahrzeit "23.1")
;;;###diary-autoload
(defun diary-hebrew-rosh-hodesh (&optional mark)
"Rosh Hodesh diary entry.
@ -976,9 +915,6 @@ use when highlighting the day in the calendar."
(calendar-hebrew-last-month-of-year
h-year))
0 h-month)))))))))
;;;###diary-autoload
(define-obsolete-function-alias 'diary-rosh-hodesh
'diary-hebrew-rosh-hodesh "23.1")
(defconst calendar-hebrew-parashiot-names
["Bereshith" "Noah" "Lech L'cha" "Vayera" "Hayei Sarah" "Toledoth"
@ -1166,8 +1102,6 @@ use when highlighting the day in the calendar."
(cdr parasha))))
(calendar-hebrew-parasha-name parasha)))))))))
(define-obsolete-function-alias 'diary-parasha 'diary-hebrew-parasha "23.1")
(declare-function solar-setup "solar" ())
(declare-function solar-sunrise-sunset "solar" (date))
@ -1199,10 +1133,6 @@ use when highlighting the day in the calendar."
60.0))
(cdr sunset)))))))))
;;;###diary-autoload
(define-obsolete-function-alias 'diary-sabbath-candles
'diary-hebrew-sabbath-candles "23.1")
(provide 'cal-hebrew)

26
lisp/calendar/cal-islam.el
View file

@ -87,9 +87,6 @@ Gregorian date Sunday, December 31, 1 BC."
leap-years-in-cycle ; leap days this cycle
(1- calendar-islamic-epoch)))) ; days before start of calendar
(define-obsolete-function-alias 'calendar-absolute-from-islamic
'calendar-islamic-to-absolute "23.1")
(defun calendar-islamic-from-absolute (date)
"Compute the Islamic date (month day year) corresponding to absolute DATE.
The absolute date is the number of days elapsed since the (imaginary)
@ -141,9 +138,6 @@ Driven by the variable `calendar-date-display-form'."
(message "Date is pre-Islamic")
(message "Islamic date (until sunset): %s" i))))
(define-obsolete-function-alias 'calendar-print-islamic-date
'calendar-islamic-print-date "23.1")
(defun calendar-islamic-read-date ()
"Interactively read the arguments for an Islamic date command.
Reads a year, month, and day."
@ -177,9 +171,6 @@ Reads a year, month, and day."
(calendar-islamic-to-absolute date)))
(or noecho (calendar-islamic-print-date)))
(define-obsolete-function-alias 'calendar-goto-islamic-date
'calendar-islamic-goto-date "23.1")
(defvar displayed-month) ; from calendar-generate
(defvar displayed-year)
@ -260,9 +251,6 @@ marked in the calendar. This function is provided for use with
diary-islamic-entry-symbol
'calendar-islamic-from-absolute))
(define-obsolete-function-alias 'list-islamic-diary-entries
'diary-islamic-list-entries "23.1")
(autoload 'calendar-mark-1 "diary-lib")
;;;###diary-autoload
@ -273,9 +261,6 @@ passed to `calendar-mark-visible-date' as MARK."
(calendar-mark-1 month day year 'calendar-islamic-from-absolute
'calendar-islamic-to-absolute color))
(define-obsolete-function-alias 'mark-islamic-calendar-date-pattern
'calendar-islamic-mark-date-pattern "23.1")
(autoload 'diary-mark-entries-1 "diary-lib")
;;;###diary-autoload
@ -288,9 +273,6 @@ window. See `diary-islamic-list-entries' for more information."
diary-islamic-entry-symbol
'calendar-islamic-from-absolute))
(define-obsolete-function-alias
'mark-islamic-diary-entries 'diary-islamic-mark-entries "23.1")
(autoload 'diary-insert-entry-1 "diary-lib")
;;;###cal-autoload
@ -303,9 +285,6 @@ Prefix argument ARG makes the entry nonmarking."
diary-islamic-entry-symbol
'calendar-islamic-from-absolute))
(define-obsolete-function-alias 'insert-islamic-diary-entry
'diary-islamic-insert-entry "23.1")
;;;###cal-autoload
(defun diary-islamic-insert-monthly-entry (arg)
"Insert a monthly diary entry.
@ -316,9 +295,6 @@ Prefix argument ARG makes the entry nonmarking."
diary-islamic-entry-symbol
'calendar-islamic-from-absolute))
(define-obsolete-function-alias 'insert-monthly-islamic-diary-entry
'diary-islamic-insert-monthly-entry "23.1")
;;;###cal-autoload
(defun diary-islamic-insert-yearly-entry (arg)
"Insert an annual diary entry.
@ -328,8 +304,6 @@ Prefix argument ARG makes the entry nonmarking."
(diary-insert-entry-1 'yearly arg calendar-islamic-month-name-array
diary-islamic-entry-symbol
'calendar-islamic-from-absolute))
(define-obsolete-function-alias
'insert-yearly-islamic-diary-entry 'diary-islamic-insert-yearly-entry "23.1")
(defvar date)

15
lisp/calendar/cal-iso.el
View file

@ -47,9 +47,6 @@ Sunday). The Gregorian date Sunday, December 31, 1 BC is imaginary."
(* 7 (1- (calendar-extract-month date)))
(if (zerop day) 6 (1- day)))))
(define-obsolete-function-alias 'calendar-absolute-from-iso
'calendar-iso-to-absolute "23.1")
;;;###cal-autoload
(defun calendar-iso-from-absolute (date)
"Compute the `ISO commercial date' corresponding to the absolute DATE.
@ -91,9 +88,6 @@ date Sunday, December 31, 1 BC."
(message "ISO date: %s"
(calendar-iso-date-string (calendar-cursor-to-date t))))
(define-obsolete-function-alias 'calendar-print-iso-date
'calendar-iso-print-date "23.1")
(defun calendar-iso-read-date (&optional dayflag)
"Interactively read the arguments for an ISO date command.
Reads a year and week, and if DAYFLAG is non-nil a day (otherwise
@ -118,9 +112,6 @@ taken to be 1)."
1)))
(list (list week day year))))
(define-obsolete-function-alias 'calendar-iso-read-args
'calendar-iso-read-date "23.1")
;;;###cal-autoload
(defun calendar-iso-goto-date (date &optional noecho)
"Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil."
@ -129,9 +120,6 @@ taken to be 1)."
(calendar-iso-to-absolute date)))
(or noecho (calendar-iso-print-date)))
(define-obsolete-function-alias 'calendar-goto-iso-date
'calendar-iso-goto-date "23.1")
;;;###cal-autoload
(defun calendar-iso-goto-week (date &optional noecho)
"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."
(calendar-iso-to-absolute date)))
(or noecho (calendar-iso-print-date)))
(define-obsolete-function-alias 'calendar-goto-iso-week
'calendar-iso-goto-week "23.1")
(defvar date)
;; To be called from diary-list-sexp-entries, where DATE is bound.

17
lisp/calendar/cal-julian.el
View file

@ -45,9 +45,6 @@ The Gregorian date Sunday, December 31, 1 BC is imaginary."
(/ (1- year) 4)
-2)))
(define-obsolete-function-alias 'calendar-absolute-from-julian
'calendar-julian-to-absolute "23.1")
;;;###cal-autoload
(defun calendar-julian-from-absolute (date)
"Compute the Julian (month day year) corresponding to the absolute DATE.
@ -93,9 +90,6 @@ Driven by the variable `calendar-date-display-form'."
(message "Julian date: %s"
(calendar-julian-date-string (calendar-cursor-to-date t))))
(define-obsolete-function-alias 'calendar-print-julian-date
'calendar-julian-print-date "23.1")
;;;###cal-autoload
(defun calendar-julian-goto-date (date &optional noecho)
"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'."
(calendar-julian-to-absolute date)))
(or noecho (calendar-julian-print-date)))
(define-obsolete-function-alias 'calendar-goto-julian-date
'calendar-julian-goto-date "23.1")
;;;###holiday-autoload
(defun holiday-julian (month day string)
"Holiday on MONTH, DAY (Julian) called STRING.
@ -156,9 +147,6 @@ nil if it is not visible in the current calendar window."
"Absolute date of astronomical (Julian) day number D."
(- d 1721424.5))
(define-obsolete-function-alias 'calendar-absolute-from-astro
'calendar-astro-to-absolute "23.1")
;;;###cal-autoload
(defun calendar-astro-from-absolute (d)
"Astronomical (Julian) day number of absolute date D."
@ -181,9 +169,6 @@ Defaults to today's date if DATE is not given."
"Astronomical (Julian) day number (at noon UTC): %s.0"
(calendar-astro-date-string (calendar-cursor-to-date t))))
(define-obsolete-function-alias 'calendar-print-astro-day-number
'calendar-astro-print-day-number "23.1")
;;;###cal-autoload
(defun calendar-astro-goto-day-number (daynumber &optional noecho)
"Move cursor to astronomical (Julian) DAYNUMBER.
@ -197,8 +182,6 @@ Echo astronomical (Julian) day number unless NOECHO is non-nil."
(calendar-astro-to-absolute daynumber))))
(or noecho (calendar-astro-print-day-number)))
(define-obsolete-function-alias 'calendar-goto-astro-day-number
'calendar-astro-goto-day-number "23.1")
(defvar date)

27
lisp/calendar/cal-mayan.el
View file

@ -132,9 +132,6 @@ but some use 1137140. Using 1232041 gives you Spinden's correlation; using
(message "Mayan date: %s"
(calendar-mayan-date-string (calendar-cursor-to-date t))))
(define-obsolete-function-alias 'calendar-print-mayan-date
'calendar-mayan-print-date "23.1")
(defun calendar-mayan-read-haab-date ()
"Prompt for a Mayan haab date."
(let* ((completion-ignore-case t)
@ -179,9 +176,6 @@ Echo Mayan date unless NOECHO is non-nil."
(calendar-absolute-from-gregorian (calendar-cursor-to-date))))))
(or noecho (calendar-mayan-print-date)))
(define-obsolete-function-alias 'calendar-next-haab-date
'calendar-mayan-next-haab-date "23.1")
;;;###cal-autoload
(defun calendar-mayan-previous-haab-date (haab-date &optional noecho)
"Move cursor to previous instance of Mayan HAAB-DATE.
@ -194,9 +188,6 @@ Echo Mayan date unless NOECHO is non-nil."
(1- (calendar-absolute-from-gregorian (calendar-cursor-to-date))))))
(or noecho (calendar-mayan-print-date)))
(define-obsolete-function-alias 'calendar-previous-haab-date
'calendar-mayan-previous-haab-date "23.1")
(defun calendar-mayan-haab-to-string (haab)
"Convert Mayan HAAB date (a pair) into its traditional written form."
(let ((month (cdr haab)))
@ -247,9 +238,6 @@ Echo Mayan date unless NOECHO is non-nil."
(calendar-absolute-from-gregorian (calendar-cursor-to-date))))))
(or noecho (calendar-mayan-print-date)))
(define-obsolete-function-alias 'calendar-next-tzolkin-date
'calendar-mayan-next-tzolkin-date "23.1")
;;;###cal-autoload
(defun calendar-mayan-previous-tzolkin-date (tzolkin-date &optional noecho)
"Move cursor to previous instance of Mayan TZOLKIN-DATE.
@ -262,9 +250,6 @@ Echo Mayan date unless NOECHO is non-nil."
(1- (calendar-absolute-from-gregorian (calendar-cursor-to-date))))))
(or noecho (calendar-mayan-print-date)))
(define-obsolete-function-alias 'calendar-previous-tzolkin-date
'calendar-mayan-previous-tzolkin-date "23.1")
(defun calendar-mayan-tzolkin-to-string (tzolkin)
"Convert Mayan TZOLKIN date (a pair) into its traditional written form."
(format "%d %s"
@ -309,9 +294,6 @@ Echo Mayan date unless NOECHO is non-nil."
(calendar-goto-date (calendar-gregorian-from-absolute date))
(or noecho (calendar-mayan-print-date)))))
(define-obsolete-function-alias 'calendar-next-calendar-round-date
'calendar-mayan-next-round-date "23.1")
;;;###cal-autoload
(defun calendar-mayan-previous-round-date
(tzolkin-date haab-date &optional noecho)
@ -330,9 +312,6 @@ Echo Mayan date unless NOECHO is non-nil."
(calendar-goto-date (calendar-gregorian-from-absolute date))
(or noecho (calendar-mayan-print-date)))))
(define-obsolete-function-alias 'calendar-previous-calendar-round-date
'calendar-mayan-previous-round-date "23.1")
(defun calendar-mayan-long-count-to-absolute (c)
"Compute the absolute date corresponding to the Mayan Long Count C.
Long count is a list (baktun katun tun uinal kin)"
@ -344,9 +323,6 @@ Long count is a list (baktun katun tun uinal kin)"
;; Days before absolute date 0.
(- calendar-mayan-days-before-absolute-zero)))
(define-obsolete-function-alias 'calendar-absolute-from-mayan-long-count
'calendar-mayan-long-count-to-absolute "23.1")
(defun calendar-mayan-long-count-common-era (lc)
"Return non-nil if long count LC represents a date in the Common Era."
(let ((base (calendar-mayan-long-count-from-absolute 1)))
@ -377,9 +353,6 @@ Echo Mayan date unless NOECHO is non-nil."
(calendar-mayan-long-count-to-absolute date)))
(or noecho (calendar-mayan-print-date)))
(define-obsolete-function-alias 'calendar-goto-mayan-long-count-date
'calendar-mayan-goto-long-count-date "23.1")
(defvar date)
;; To be called from diary-list-sexp-entries, where DATE is bound.

8
lisp/calendar/cal-menu.el
View file

@ -278,14 +278,6 @@ is non-nil."
["Show diary" diary-show-all-entries]
["Exit calendar" calendar-exit]))
;; Undocumented and probably useless.
(defvar cal-menu-load-hook nil
"Hook run on loading of the `cal-menu' package.")
(make-obsolete-variable 'cal-menu-load-hook
"it will be removed in future." "23.1")
(run-hooks 'cal-menu-load-hook)
(provide 'cal-menu)
;; Local Variables:

12
lisp/calendar/cal-move.el
View file

@ -175,9 +175,6 @@ EVENT is an event like `last-nonmenu-event'."
(t (list month 1 year))))))
(run-hooks 'calendar-move-hook)))
(define-obsolete-function-alias
'scroll-calendar-left 'calendar-scroll-left "23.1")
;;;###cal-autoload
(defun calendar-scroll-right (&optional arg event)
"Scroll the displayed calendar window right by ARG months.
@ -188,9 +185,6 @@ EVENT is an event like `last-nonmenu-event'."
last-nonmenu-event))
(calendar-scroll-left (- (or arg 1)) event))
(define-obsolete-function-alias
'scroll-calendar-right 'calendar-scroll-right "23.1")
;;;###cal-autoload
(defun calendar-scroll-left-three-months (arg &optional event)
"Scroll the displayed calendar window left by 3*ARG months.
@ -201,9 +195,6 @@ EVENT is an event like `last-nonmenu-event'."
last-nonmenu-event))
(calendar-scroll-left (* 3 arg) event))
(define-obsolete-function-alias 'scroll-calendar-left-three-months
'calendar-scroll-left-three-months "23.1")
;; cf scroll-bar-toolkit-scroll
;;;###cal-autoload
(defun calendar-scroll-toolkit-scroll (event)
@ -226,9 +217,6 @@ EVENT is an event like `last-nonmenu-event'."
last-nonmenu-event))
(calendar-scroll-left (* -3 arg) event))
(define-obsolete-function-alias 'scroll-calendar-right-three-months
'calendar-scroll-right-three-months "23.1")
;;;###cal-autoload
(defun calendar-forward-day (arg)
"Move the cursor forward ARG days.

11
lisp/calendar/cal-persia.el
View file

@ -87,9 +87,6 @@ Gregorian date Sunday, December 31, 1 BC."
(calendar-persian-last-day-of-month m year))
day)))) ; days so far this month
(define-obsolete-function-alias 'calendar-absolute-from-persian
'calendar-persian-to-absolute "23.1")
(defun calendar-persian-year-from-absolute (date)
"Persian year corresponding to the absolute DATE."
(let* ((d0 ; prior days since start of 2820 cycles
@ -163,9 +160,6 @@ Gregorian date Sunday, December 31, 1 BC."
(message "Persian date: %s"
(calendar-persian-date-string (calendar-cursor-to-date t))))
(define-obsolete-function-alias 'calendar-print-persian-date
'calendar-persian-print-date "23.1")
(defun calendar-persian-read-date ()
"Interactively read the arguments for a Persian date command.
Reads a year, month, and day."
@ -192,9 +186,6 @@ Reads a year, month, and day."
(lambda (x) (and (< 0 x) (<= x last))))))
(list (list month day year))))
(define-obsolete-function-alias 'persian-prompt-for-date
'calendar-persian-read-date "23.1")
;;;###cal-autoload
(defun calendar-persian-goto-date (date &optional noecho)
"Move cursor to Persian date DATE.
@ -204,8 +195,6 @@ Echo Persian date unless NOECHO is non-nil."
(calendar-persian-to-absolute date)))
(or noecho (calendar-persian-print-date)))
(define-obsolete-function-alias 'calendar-goto-persian-date
'calendar-persian-goto-date "23.1")
(defvar date)

33
lisp/calendar/cal-x.el
View file

@ -65,9 +65,6 @@ Relevant if `calendar-setup' has the value `one-frame'."
(vertical-scroll-bars boolean))
:group 'calendar)
(define-obsolete-variable-alias 'calendar-after-frame-setup-hooks
'calendar-after-frame-setup-hook "23.1")
(defcustom calendar-after-frame-setup-hook nil
"List of functions to be run after creating a calendar and/or diary frame."
:type 'hook
@ -150,36 +147,6 @@ If PROMPT is non-nil, prompt for the month and year to use."
(if (eq config 'one-frame)
(calendar-dedicate-diary))))))
;;;###cal-autoload
(defun calendar-one-frame-setup (&optional prompt)
"Display calendar and diary in a single dedicated frame.
See `calendar-frame-setup' for more information."
(declare (obsolete calendar-frame-setup "23.1"))
(calendar-frame-setup 'one-frame prompt))
;;;###cal-autoload
(defun calendar-only-one-frame-setup (&optional prompt)
"Display calendar in a dedicated frame.
See `calendar-frame-setup' for more information."
(declare (obsolete calendar-frame-setup "23.1"))
(calendar-frame-setup 'calendar-only prompt))
;;;###cal-autoload
(defun calendar-two-frame-setup (&optional prompt)
"Display calendar and diary in separate, dedicated frames.
See `calendar-frame-setup' for more information."
(declare (obsolete calendar-frame-setup "23.1"))
(calendar-frame-setup 'two-frames prompt))
;; Undocumented and probably useless.
(defvar cal-x-load-hook nil
"Hook run on loading of the `cal-x' package.")
(make-obsolete-variable 'cal-x-load-hook "it will be removed in future." "23.1")
(run-hooks 'cal-x-load-hook)
(provide 'cal-x)
;;; cal-x.el ends here

135
lisp/calendar/calendar.el
View file

@ -189,9 +189,6 @@ movement commands will not work correctly."
(calendar-redraw))
:group 'calendar)
(define-obsolete-variable-alias 'view-diary-entries-initially
'calendar-view-diary-initially-flag "23.1")
(defcustom calendar-view-diary-initially-flag nil
"Non-nil means display current date's diary entries on entry to calendar.
The diary is displayed in another window when the calendar is first displayed,
@ -201,9 +198,6 @@ be overridden by the value of `calendar-setup'."
:type 'boolean
:group 'diary)
(define-obsolete-variable-alias 'mark-diary-entries-in-calendar
'calendar-mark-diary-entries-flag "23.1")
;; FIXME :set
(defcustom calendar-mark-diary-entries-flag nil
"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."
See the variable `calendar-today-marker'."
:group 'calendar-faces)
(define-obsolete-face-alias 'calendar-today-face 'calendar-today "22.1")
(defface diary
'((((min-colors 88) (class color) (background light))
:foreground "red1")
@ -243,8 +235,6 @@ Used to mark diary entries in the calendar (see `diary-entry-marker'),
and to highlight the date header in the fancy diary."
:group 'calendar-faces)
(define-obsolete-face-alias 'diary-face 'diary "22.1")
(defface holiday
'((((class color) (background light))
:background "pink")
@ -256,8 +246,6 @@ and to highlight the date header in the fancy diary."
See `calendar-holiday-marker'."
:group 'calendar-faces)
(define-obsolete-face-alias 'holiday-face 'holiday "22.1")
(defface calendar-weekday-header '((t :inherit font-lock-constant-face))
"Face used for weekday column headers in the calendar.
See also the face `calendar-weekend-header'."
@ -307,9 +295,6 @@ The value can be either a single-character string (e.g. \"*\") or a face."
:group 'holidays
:version "23.1")
(define-obsolete-variable-alias 'view-calendar-holidays-initially
'calendar-view-holidays-initially-flag "23.1")
(defcustom calendar-view-holidays-initially-flag nil
"Non-nil means display holidays for current three month period on entry.
The holidays are displayed in another window when the calendar is first
@ -317,9 +302,6 @@ displayed."
:type 'boolean
:group 'holidays)
(define-obsolete-variable-alias 'mark-holidays-in-calendar
'calendar-mark-holidays-flag "23.1")
;; FIXME :set
(defcustom calendar-mark-holidays-flag nil
"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'."
:type 'hook
:group 'calendar-hooks)
(define-obsolete-variable-alias 'initial-calendar-window-hook
'calendar-initial-window-hook "23.1")
(defcustom calendar-initial-window-hook nil
"List of functions to be called when the calendar window is created.
Quitting the calendar and re-entering it will cause these functions
@ -348,9 +327,6 @@ to be called again."
:type 'hook
:group 'calendar-hooks)
(define-obsolete-variable-alias 'today-visible-calendar-hook
'calendar-today-visible-hook "23.1")
(defcustom calendar-today-visible-hook nil
"List of functions called whenever the current date is visible.
To mark today's date, add the function `calendar-mark-today'.
@ -363,9 +339,6 @@ since it may cause the movement commands to fail."
:options '(calendar-mark-today calendar-star-date)
:group 'calendar-hooks)
(define-obsolete-variable-alias 'today-invisible-calendar-hook
'calendar-today-invisible-hook "23.1")
(defcustom calendar-today-invisible-hook nil
"List of functions called whenever the current date is not visible.
See also `calendar-today-visible-hook'."
@ -694,54 +667,22 @@ details, see the documentation for the variable `diary-list-entries-hook'."
:group 'diary
:version "25.1")
(define-obsolete-variable-alias 'hebrew-diary-entry-symbol
'diary-hebrew-entry-symbol "23.1")
(defcustom diary-hebrew-entry-symbol "H"
"Symbol indicating a diary entry according to the Hebrew calendar."
:type 'string
:group 'diary)
(define-obsolete-variable-alias 'islamic-diary-entry-symbol
'diary-islamic-entry-symbol "23.1")
(defcustom diary-islamic-entry-symbol "I"
"Symbol indicating a diary entry according to the Islamic calendar."
:type 'string
:group 'diary)
(define-obsolete-variable-alias 'bahai-diary-entry-symbol
'diary-bahai-entry-symbol "23.1")
(defcustom diary-bahai-entry-symbol "B"
"Symbol indicating a diary entry according to the Bahá'í calendar."
:type 'string
:group 'diary)
(defcustom european-calendar-style nil
"Non-nil means use the European style of dates in the diary and display.
In this case, a date like 1/2/1990 would be interpreted as
February 1, 1990. See `diary-european-date-forms' for the
default European diary date styles.
Setting this variable directly does not take effect (if the
calendar package is already loaded). Rather, use either
\\[customize] or the function `calendar-set-date-style'."
:type 'boolean
;; Without :initialize (require 'calendar) throws an error because
;; calendar-set-date-style is undefined at this point.
:initialize 'custom-initialize-default
:set (lambda (symbol value)
(if value
(calendar-set-date-style 'european)
(calendar-set-date-style 'american)))
:group 'calendar)
(make-obsolete-variable 'european-calendar-style 'calendar-date-style "23.1")
;; If this is autoloaded, c-d-s gets set before any customization of e-c-s.
(defcustom calendar-date-style (if european-calendar-style 'european
'american)
(defcustom calendar-date-style 'american
"Your preferred style for writing dates.
The options are:
`american' - month/day/year
@ -790,9 +731,6 @@ but `diary-date-forms' (which see)."
(choice symbol regexp)))))
:group 'diary)
(define-obsolete-variable-alias 'american-date-diary-pattern
'diary-american-date-forms "23.1")
(defcustom diary-american-date-forms
'((month "/" day "[^/0-9]")
(month "/" day "/" year "[^0-9]")
@ -814,9 +752,6 @@ but `diary-date-forms' (which see)."
(choice symbol regexp)))))
:group 'diary)
(define-obsolete-variable-alias 'european-date-diary-pattern
'diary-european-date-forms "23.1")
(defcustom diary-european-date-forms
'((day "/" month "[^/0-9]")
(day "/" month "/" year "[^0-9]")
@ -906,9 +841,6 @@ Normally you should not customize this, but `calendar-date-display-form'
:version "23.1"
:group 'calendar)
(define-obsolete-variable-alias 'european-calendar-display-form
'calendar-european-date-display-form "23.1")
(defcustom calendar-european-date-display-form
'((if dayname (concat dayname ", ")) day " " monthname " " year)
"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'
:type 'sexp
:group 'calendar)
(define-obsolete-variable-alias 'american-calendar-display-form
'calendar-american-date-display-form "23.1")
(defcustom calendar-american-date-display-form
'((if dayname (concat dayname ", ")) monthname " " day ", " year)
"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'."
(calendar-redraw)
(calendar-update-mode-line))
(defun european-calendar ()
"Set the interpretation and display of dates to the European style."
(declare (obsolete calendar-set-date-style "23.1"))
(interactive)
(calendar-set-date-style 'european))
(defun american-calendar ()
"Set the interpretation and display of dates to the American style."
(declare (obsolete calendar-set-date-style "23.1"))
(interactive)
(calendar-set-date-style 'american))
(define-obsolete-variable-alias 'holidays-in-diary-buffer
'diary-show-holidays-flag "23.1")
(defcustom diary-show-holidays-flag t
"Non-nil means include holidays in the diary display.
The 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."
:type 'boolean
:group 'calendar)
(define-obsolete-variable-alias 'all-hebrew-calendar-holidays
'calendar-hebrew-all-holidays-flag "23.1")
(defcustom calendar-hebrew-all-holidays-flag nil
"If nil, show only major holidays from the Hebrew calendar.
This means only those Jewish holidays that appear on secular calendars.
@ -1073,9 +984,6 @@ calendar."
:type 'boolean
:group 'holidays)
(define-obsolete-variable-alias 'all-christian-calendar-holidays
'calendar-christian-all-holidays-flag "23.1")
(defcustom calendar-christian-all-holidays-flag nil
"If nil, show only major holidays from the Christian calendar.
This means only those Christian holidays that appear on secular calendars.
@ -1084,9 +992,6 @@ calendar."
:type 'boolean
:group 'holidays)
(define-obsolete-variable-alias 'all-islamic-calendar-holidays
'calendar-islamic-all-holidays-flag "23.1")
(defcustom calendar-islamic-all-holidays-flag nil
"If nil, show only major holidays from the Islamic calendar.
This means only those Islamic holidays that appear on secular calendars.
@ -1095,9 +1000,6 @@ calendar."
:type 'boolean
:group 'holidays)
(define-obsolete-variable-alias 'all-bahai-calendar-holidays
'calendar-bahai-all-holidays-flag "23.1")
(defcustom calendar-bahai-all-holidays-flag nil
"If nil, show only major holidays from the Bahá'í calendar.
These are the days on which work and school must be suspended.
@ -1128,8 +1030,6 @@ calendar."
(defconst diary-fancy-buffer "*Fancy Diary Entries*"
"Name of the buffer used for the optional fancy display of the diary.")
(define-obsolete-variable-alias 'fancy-diary-buffer 'diary-fancy-buffer "23.1")
(defconst calendar-other-calendars-buffer "*Other Calendars*"
"Name of the buffer used for the display of date on other calendars.")
@ -1162,9 +1062,6 @@ Optional NMONTHS is the number of months per year (default 12)."
(and (< macro-y 0) (> ,mon 1) (setq ,yr (1- ,yr)))
(if (< ,yr 1) (setq ,yr (1- ,yr))))) ; 0 AD -> -1 BC, etc
(define-obsolete-function-alias 'increment-calendar-month
'calendar-increment-month "23.1")
(defvar displayed-month)
(defvar displayed-year)
@ -1177,17 +1074,6 @@ MON defaults to `displayed-month'. YR defaults to `displayed-year'."
(calendar-increment-month mon yr n)
(cons mon yr))
(defmacro calendar-for-loop (var from init to final do &rest body)
"Execute a for loop.
Evaluate BODY with VAR bound to successive integers from INIT to FINAL,
inclusive. The standard macro `dotimes' is preferable in most cases."
(declare (obsolete "use `dotimes' or `while' instead." "23.1")
(debug (symbolp "from" form "to" form "do" body))
(indent defun))
`(let ((,var (1- ,init)))
(while (>= ,final (setq ,var (1+ ,var)))
,@body)))
(defmacro calendar-sum (index initial condition expression)
"For INDEX = INITIAL, +1, ... (as long as CONDITION holds), sum EXPRESSION."
(declare (debug (symbolp form form form)))
@ -1247,25 +1133,16 @@ with disabled undo. Leaves point at point-min, displays BUFFER."
"Extract the month part of DATE which has the form (month day year)."
(car date))
(define-obsolete-function-alias 'extract-calendar-month
'calendar-extract-month "23.1")
;; Note gives wrong answer for result of (calendar-read-date 'noday),
;; but that is only used by `calendar-other-month'.
(defsubst calendar-extract-day (date)
"Extract the day part of DATE which has the form (month day year)."
(cadr date))
(define-obsolete-function-alias 'extract-calendar-day
'calendar-extract-day "23.1")
(defsubst calendar-extract-year (date)
"Extract the year part of DATE which has the form (month day year)."
(nth 2 date))
(define-obsolete-function-alias 'extract-calendar-year
'calendar-extract-year "23.1")
(defsubst calendar-leap-year-p (year)
"Return t if YEAR is a Gregorian leap year.
A 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."
(dolist (b calendar-buffers)
(quit-windows-on b kill))))))
(define-obsolete-function-alias 'exit-calendar 'calendar-exit "23.1")
(defun calendar-current-date (&optional offset)
"Return the current date in a list (month day year).
Optional integer OFFSET is a number of days from the current date."
@ -2496,9 +2371,6 @@ Returns the corresponding Gregorian date."
;; Note there are side effects on calendar navigation.
(<= 1 year))))
(define-obsolete-function-alias 'calendar-date-is-legal-p
'calendar-date-is-valid-p "23.1")
(defun calendar-date-equal (date1 date2)
"Return t if the DATE1 and DATE2 are the same."
(and
@ -2571,9 +2443,6 @@ MARK defaults to `diary-entry-marker'."
(make-overlay (1- (point)) (1+ (point))) 'face
(calendar-make-temp-face mark))))))))
(define-obsolete-function-alias 'mark-visible-calendar-date
'calendar-mark-visible-date "23.1")
(defun calendar-star-date ()
"Replace the date under the cursor in the calendar window with asterisks.
You 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."
"---")
(calendar-string-spread (list str) ?- width)))))
(define-obsolete-function-alias 'calendar-version 'emacs-version "23.1")
(run-hooks 'calendar-load-hook)
(provide 'calendar)

117
lisp/calendar/diary-lib.el
View file

@ -48,13 +48,6 @@ are holidays."
:type 'boolean
:group 'diary)
(defcustom diary-face 'diary
"Face name to use for diary entries."
:type 'face
:group 'calendar-faces)
(make-obsolete-variable 'diary-face "customize the face `diary' instead."
"23.1")
(defface diary-anniversary '((t :inherit font-lock-keyword-face))
"Face used for anniversaries in the fancy diary display."
:version "22.1"
@ -71,8 +64,6 @@ are holidays."
:version "22.1"
:group 'calendar-faces)
(define-obsolete-face-alias 'diary-button-face 'diary-button "22.1")
;; Face markup of calendar and diary displays: Any entry line that
;; ends with [foo:value] where foo is a face attribute (except :box
;; :stipple) or with [face:blah] tags, will have these values applied
@ -132,9 +123,6 @@ are: `string', `symbol', `int', `tnil', `stringtnil.'"
:type 'function
:group 'diary)
(define-obsolete-variable-alias 'sexp-diary-entry-symbol
'diary-sexp-entry-symbol "23.1")
(defcustom diary-sexp-entry-symbol "%%"
"The string used to indicate a sexp diary entry in `diary-file'.
See the documentation for the function `diary-list-sexp-entries'."
@ -167,9 +155,6 @@ Used for example by the appointment package - see `appt-activate'."
:type 'hook
:group 'diary)
(define-obsolete-variable-alias 'diary-display-hook 'diary-display-function
"23.1")
(defcustom diary-display-function 'diary-fancy-display
"Function used to display the diary.
The two standard options are `diary-fancy-display' and `diary-simple-display'.
@ -195,9 +180,6 @@ holidays), or hard copy output."
:version "23.2" ; simple->fancy
:group 'diary)
(define-obsolete-variable-alias 'list-diary-entries-hook
'diary-list-entries-hook "23.1")
(defcustom diary-list-entries-hook nil
"Hook run after diary file is culled for relevant entries.
@ -226,9 +208,6 @@ the main file and all included files, you would use the nongregorian hook."
:options '(diary-include-other-diary-files diary-sort-entries)
:group 'diary)
(define-obsolete-variable-alias 'mark-diary-entries-hook
'diary-mark-entries-hook "23.1")
(defcustom diary-mark-entries-hook nil
"List of functions called after marking diary entries in the calendar.
You 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,
:options '(diary-mark-included-diary-files)
:group 'diary)
(define-obsolete-variable-alias 'nongregorian-diary-listing-hook
'diary-nongregorian-listing-hook "23.1")
(defcustom diary-nongregorian-listing-hook nil
"List of functions called for listing diary file and included files.
As 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."
diary-islamic-list-entries)
:group 'diary)
(define-obsolete-variable-alias 'nongregorian-diary-marking-hook
'diary-nongregorian-marking-hook "23.1")
(defcustom diary-nongregorian-marking-hook nil
"List of functions called for marking diary file and included files.
As 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."
diary-islamic-mark-entries)
:group 'diary)
(define-obsolete-variable-alias 'print-diary-entries-hook
'diary-print-entries-hook "23.1")
(defcustom diary-print-entries-hook 'lpr-buffer
"Run by `diary-print-entries' after preparing a temporary diary buffer.
The buffer shows only the diary entries currently visible in the
@ -333,9 +303,6 @@ expressions that can involve the keywords `days' (a number), `date'
:type 'sexp
:group 'diary)
(define-obsolete-variable-alias 'abbreviated-calendar-year
'diary-abbreviated-year-flag "23.1")
(defcustom diary-abbreviated-year-flag t
"Interpret a two-digit year DD in a diary entry as either 19DD or 20DD.
This 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."
;; Note this assumes diary was called without prefix arg.
(diary))))
(define-obsolete-variable-alias 'number-of-diary-entries
'diary-number-of-entries "23.1")
(defcustom diary-number-of-entries 1
"Specifies how many days of diary entries are to be displayed initially.
This variable affects the diary display when the command \\[diary] is
@ -562,10 +526,6 @@ DFILE specifies the file to use as the diary file."
(let ((diary-file dfile))
(diary-view-entries arg)))
;;;###cal-autoload
(define-obsolete-function-alias 'view-other-diary-entries
'diary-view-other-diary-entries "23.1")
(defvar diary-syntax-table
(let ((st (copy-syntax-table (standard-syntax-table))))
(modify-syntax-entry ?* "w" st)
@ -684,8 +644,6 @@ Also removes the region between `diary-comment-start' and
(list marker dfile literal)
globcolor)))))))
(define-obsolete-function-alias 'add-to-diary-list 'diary-add-to-list "23.1")
(defun diary-list-entries-2 (date mark globattr list-only
&optional months symbol gdate)
"Internal subroutine of `diary-list-entries'.
@ -975,9 +933,6 @@ For details, see `diary-include-files'.
See also `diary-mark-included-diary-files'."
(diary-include-files))
(define-obsolete-function-alias 'include-other-diary-files
'diary-include-other-diary-files "23.1")
(defvar date-string) ; bound in diary-list-entries
(defun diary-display-no-entries ()
@ -1036,9 +991,6 @@ in the mode line. This is an option for `diary-display-function'."
(set-window-point window diary-saved-point)
(set-window-start window (point-min)))))))
(define-obsolete-function-alias 'simple-diary-display
'diary-simple-display "23.1")
(defvar diary-goto-entry-function 'diary-goto-entry
"Function called to jump to a diary entry.
Modes that require special handling of the included file
@ -1165,9 +1117,6 @@ This is an option for `diary-display-function'."
(diary-fancy-display-mode))
(calendar-set-mode-line date-string))))
(define-obsolete-function-alias 'fancy-diary-display
'diary-fancy-display "23.1")
;; FIXME modernize?
(defun diary-print-entries ()
"Print a hard copy of the diary display.
@ -1212,9 +1161,6 @@ the actual printing."
(run-hooks 'diary-print-entries-hook)
(kill-buffer temp-buffer))))
(define-obsolete-function-alias 'print-diary-entries
'diary-print-entries "23.1")
;;;###cal-autoload
(defun diary-show-all-entries ()
"Show all of the diary entries in the diary file.
@ -1462,9 +1408,6 @@ marks. This is intended to deal with deleted diary entries."
(and temp-buff (buffer-name temp-buff) (kill-buffer temp-buff)))
(or d-incp (message "Marking diary entries...done"))))
;;;###cal-autoload
(define-obsolete-function-alias 'mark-diary-entries 'diary-mark-entries "23.1")
(defun diary-sexp-entry (sexp entry date)
"Process a SEXP diary ENTRY for DATE."
(let ((result (if calendar-debug-sexp
@ -1542,9 +1485,6 @@ is marked. See the documentation for the function `diary-list-sexp-entries'."
(or (cadr (diary-pull-attrs entry file-glob-attrs))
(if (consp mark) (car mark)))))))))
(define-obsolete-function-alias 'mark-sexp-diary-entries
'diary-mark-sexp-entries "23.1")
(defun diary-mark-included-diary-files ()
"Mark diary entries from included diary files.
To use, add this function to `diary-mark-entries-hook'.
@ -1552,9 +1492,6 @@ For details, see `diary-include-files'.
See also `diary-include-other-diary-files'."
(diary-include-files t))
(define-obsolete-function-alias 'mark-included-diary-files
'diary-mark-included-diary-files "23.1")
(defun calendar-mark-days-named (dayname &optional color)
"Mark all dates in the calendar window that are day DAYNAME of the week.
0 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."
color)
(setq day (+ day 7))))))
(define-obsolete-function-alias 'mark-calendar-days-named
'calendar-mark-days-named "23.1")
(defun calendar-mark-month (month year p-month p-day p-year &optional color)
"Mark dates in the MONTH/YEAR that conform to pattern P-MONTH/P-DAY/P-YEAR.
A 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."
(calendar-mark-visible-date (list month (1+ i) year) color))
(calendar-mark-visible-date (list month p-day year) color))))
(define-obsolete-function-alias 'mark-calendar-month
'calendar-mark-month "23.1")
(defun calendar-mark-date-pattern (month day year &optional color)
"Mark all dates in the calendar window that conform to MONTH/DAY/YEAR.
A 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."
(calendar-mark-month m y month day year color)
(calendar-increment-month m y 1)))))
(define-obsolete-function-alias 'mark-calendar-date-pattern
'calendar-mark-date-pattern "23.1")
;; Bahai, Hebrew, Islamic.
(defun calendar-mark-complex (month day year fromabs &optional color)
"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
entries, or change the order."
(setq diary-entries-list (sort diary-entries-list 'diary-entry-compare)))
(define-obsolete-function-alias 'sort-diary-entries 'diary-sort-entries "23.1")
(defun diary-list-sexp-entries (date)
"Add sexp entries for DATE from the diary file to `diary-entries-list'.
@ -1877,9 +1803,6 @@ best if they are non-marking."
(setq entry-found (or entry-found diary-entry)))
entry-found))
(define-obsolete-function-alias 'list-sexp-diary-entries
'diary-list-sexp-entries "23.1")
(defun diary-make-date (a b c)
"Convert A B C into the internal calendar date form.
The expected order of the inputs depends on `calendar-date-style',
@ -2140,9 +2063,6 @@ If omitted, NONMARKING defaults to nil and FILE defaults to
(if nonmarking diary-nonmarking-symbol "")
string " "))
;;;###cal-autoload
(define-obsolete-function-alias 'make-diary-entry 'diary-make-entry "23.1")
;;;###cal-autoload
(defun diary-insert-entry (arg &optional event)
"Insert a diary entry for the date indicated by point.
@ -2152,9 +2072,6 @@ Prefix argument ARG makes the entry nonmarking."
(diary-make-entry (calendar-date-string (calendar-cursor-to-date t event) t t)
arg))
;;;###cal-autoload
(define-obsolete-function-alias 'insert-diary-entry 'diary-insert-entry "23.1")
;;;###cal-autoload
(defun diary-insert-weekly-entry (arg)
"Insert a weekly diary entry for the day of the week indicated by point.
@ -2163,10 +2080,6 @@ Prefix argument ARG makes the entry nonmarking."
(diary-make-entry (calendar-day-name (calendar-cursor-to-date t))
arg))
;;;###cal-autoload
(define-obsolete-function-alias 'insert-weekly-diary-entry
'diary-insert-weekly-entry "23.1")
(defun diary-date-display-form (&optional type)
"Return value for `calendar-date-display-form' using `calendar-date-style'.
Optional symbol TYPE is either `monthly' or `yearly'."
@ -2221,10 +2134,6 @@ Prefix argument ARG makes the entry nonmarking."
(interactive "P")
(diary-insert-entry-1 'monthly arg))
;;;###cal-autoload
(define-obsolete-function-alias 'insert-monthly-diary-entry
'diary-insert-monthly-entry "23.1")
;;;###cal-autoload
(defun diary-insert-yearly-entry (arg)
"Insert an annual diary entry for the day of the year indicated by point.
@ -2232,10 +2141,6 @@ Prefix argument ARG makes the entry nonmarking."
(interactive "P")
(diary-insert-entry-1 'yearly arg))
;;;###cal-autoload
(define-obsolete-function-alias 'insert-yearly-diary-entry
'diary-insert-yearly-entry "23.1")
;;;###cal-autoload
(defun diary-insert-anniversary-entry (arg)
"Insert an anniversary diary entry for the date given by point.
@ -2248,10 +2153,6 @@ Prefix argument ARG makes the entry nonmarking."
(calendar-date-string (calendar-cursor-to-date t) nil t))
arg)))
;;;###cal-autoload
(define-obsolete-function-alias 'insert-anniversary-diary-entry
'diary-insert-anniversary-entry "23.1")
;;;###cal-autoload
(defun diary-insert-block-entry (arg)
"Insert a block diary entry for the days between the point and marked date.
@ -2275,10 +2176,6 @@ Prefix argument ARG makes the entry nonmarking."
(calendar-date-string end nil t))
arg)))
;;;###cal-autoload
(define-obsolete-function-alias 'insert-block-diary-entry
'diary-insert-block-entry "23.1")
;;;###cal-autoload
(defun diary-insert-cyclic-entry (arg)
"Insert a cyclic diary entry starting at the date given by point.
@ -2293,10 +2190,6 @@ Prefix argument ARG makes the entry nonmarking."
(calendar-date-string (calendar-cursor-to-date t) nil t))
arg)))
;;;###cal-autoload
(define-obsolete-function-alias 'insert-cyclic-diary-entry
'diary-insert-cyclic-entry "23.1")
;;; Diary mode.
(defun diary-redraw-calendar ()
@ -2357,7 +2250,7 @@ full month names."
(if (equal (car x) 'backup)
(concat "\\)" (eval (car (reverse x))))
"\\)"))
'(1 diary-face)))
'(1 'diary)))
diary-date-forms)))
(defmacro diary-font-lock-keywords-1 (markfunc listfunc feature months symbol)
@ -2494,11 +2387,8 @@ This depends on the calendar date style."
(put-text-property (match-beginning 0) (match-end 0) 'font-lock-multiline t)
t))
(define-obsolete-variable-alias 'fancy-diary-font-lock-keywords
'diary-fancy-font-lock-keywords "23.1")
(defvar diary-fancy-font-lock-keywords
`((diary-fancy-date-matcher . diary-face)
`((diary-fancy-date-matcher . 'diary)
("^.*\\([aA]nniversary\\|[bB]irthday\\).*$" . 'diary-anniversary)
("^.*Yahrzeit.*$" . font-lock-constant-face)
("^\\(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."
(list (cons t diary-fancy-overriding-map)))
(view-mode 1))
(define-obsolete-function-alias 'fancy-diary-display-mode
'diary-fancy-display-mode "23.1")
;; Following code from Dave Love <fx@gnu.org>.
;; Import Outlook-format appointments from mail messages in Gnus or
;; Rmail using command `diary-from-outlook'. This, or the specialized

138
lisp/calendar/holidays.el
View file

@ -1,7 +1,7 @@
;;; holidays.el --- holiday functions for the calendar package
;; Copyright (C) 1989-1990, 1992-1994, 1997, 2001-2014 Free Software
;; Foundation, Inc.
;; Copyright (C) 1989-1990, 1992-1994, 1997, 2001-2014
;; Free Software Foundation, Inc.
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <rgm@gnu.org>
@ -42,9 +42,6 @@
;; are used to using them to set calendar-holidays without having to
;; explicitly load this file.
;;;###autoload
(define-obsolete-variable-alias 'general-holidays
'holiday-general-holidays "23.1")
;;;###autoload
(defcustom holiday-general-holidays
(mapcar 'purecopy
@ -72,9 +69,6 @@ See the documentation for `calendar-holidays' for details."
;;;###autoload
(put 'holiday-general-holidays 'risky-local-variable t)
;;;###autoload
(define-obsolete-variable-alias 'oriental-holidays
'holiday-oriental-holidays "23.1")
;;;###autoload
(defcustom holiday-oriental-holidays
(mapcar 'purecopy
@ -97,8 +91,6 @@ See the documentation for `calendar-holidays' for details."
;;;###autoload
(put 'holiday-oriental-holidays 'risky-local-variable t)
;;;###autoload
(define-obsolete-variable-alias 'local-holidays 'holiday-local-holidays "23.1")
;;;###autoload
(defcustom holiday-local-holidays nil
"Local holidays.
@ -108,8 +100,6 @@ See the documentation for `calendar-holidays' for details."
;;;###autoload
(put 'holiday-local-holidays 'risky-local-variable t)
;;;###autoload
(define-obsolete-variable-alias 'other-holidays 'holiday-other-holidays "23.1")
;;;###autoload
(defcustom holiday-other-holidays nil
"User defined holidays.
@ -119,108 +109,6 @@ See the documentation for `calendar-holidays' for details."
;;;###autoload
(put 'holiday-other-holidays 'risky-local-variable t)
;;;###autoload
(defvar hebrew-holidays-1
(mapcar 'purecopy
'((holiday-hebrew-rosh-hashanah)
(if calendar-hebrew-all-holidays-flag
(holiday-julian
11
(let ((m displayed-month)
(y displayed-year)
year)
(calendar-increment-month m y -1)
(setq year (calendar-extract-year
(calendar-julian-from-absolute
(calendar-absolute-from-gregorian (list m 1 y)))))
(if (zerop (% (1+ year) 4))
22
21)) "\"Tal Umatar\" (evening)"))))
"Component of the old default value of `holiday-hebrew-holidays'.")
;;;###autoload
(put 'hebrew-holidays-1 'risky-local-variable t)
(make-obsolete-variable 'hebrew-holidays-1 'hebrew-holidays "23.1")
;;;###autoload
(defvar hebrew-holidays-2
(mapcar 'purecopy
'((holiday-hebrew-hanukkah) ; respects calendar-hebrew-all-holidays-flag
(if calendar-hebrew-all-holidays-flag
(holiday-hebrew
10
(let ((h-year (calendar-extract-year
(calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
(list displayed-month 28 displayed-year))))))
(if (= 6 (% (calendar-hebrew-to-absolute (list 10 10 h-year))
7))
11 10))
"Tzom Teveth"))
(if calendar-hebrew-all-holidays-flag
(holiday-hebrew 11 15 "Tu B'Shevat"))))
"Component of the old default value of `holiday-hebrew-holidays'.")
;;;###autoload
(put 'hebrew-holidays-2 'risky-local-variable t)
(make-obsolete-variable 'hebrew-holidays-2 'hebrew-holidays "23.1")
;;;###autoload
(defvar hebrew-holidays-3
(mapcar 'purecopy
'((if calendar-hebrew-all-holidays-flag
(holiday-hebrew
11
(let* ((m displayed-month)
(y displayed-year)
(h-year (progn
(calendar-increment-month m y 1)
(calendar-extract-year
(calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
(list m (calendar-last-day-of-month m y) y))))))
(s-s
(calendar-hebrew-from-absolute
(if (= 6
(% (calendar-hebrew-to-absolute
(list 7 1 h-year))
7))
(calendar-dayname-on-or-before
6 (calendar-hebrew-to-absolute
(list 11 17 h-year)))
(calendar-dayname-on-or-before
6 (calendar-hebrew-to-absolute
(list 11 16 h-year))))))
(day (calendar-extract-day s-s)))
day)
"Shabbat Shirah"))))
"Component of the old default value of `holiday-hebrew-holidays'.")
;;;###autoload
(put 'hebrew-holidays-3 'risky-local-variable t)
(make-obsolete-variable 'hebrew-holidays-3 'hebrew-holidays "23.1")
;;;###autoload
(defvar hebrew-holidays-4
(mapcar 'purecopy
'((holiday-hebrew-passover)
(and calendar-hebrew-all-holidays-flag
(let* ((m displayed-month)
(y displayed-year)
(year (progn
(calendar-increment-month m y -1)
(calendar-extract-year
(calendar-julian-from-absolute
(calendar-absolute-from-gregorian (list m 1 y)))))))
(= 21 (% year 28)))
(holiday-julian 3 26 "Kiddush HaHamah"))
(if calendar-hebrew-all-holidays-flag
(holiday-hebrew-tisha-b-av))))
"Component of the old default value of `holiday-hebrew-holidays'.")
;;;###autoload
(put 'hebrew-holidays-4 'risky-local-variable t)
(make-obsolete-variable 'hebrew-holidays-4 'hebrew-holidays "23.1")
;;;###autoload
(define-obsolete-variable-alias 'hebrew-holidays
'holiday-hebrew-holidays "23.1")
;;;###autoload
(defcustom holiday-hebrew-holidays
(mapcar 'purecopy
@ -239,9 +127,6 @@ See the documentation for `calendar-holidays' for details."
;;;###autoload
(put 'holiday-hebrew-holidays 'risky-local-variable t)
;;;###autoload
(define-obsolete-variable-alias 'christian-holidays
'holiday-christian-holidays "23.1")
;;;###autoload
(defcustom holiday-christian-holidays
(mapcar 'purecopy
@ -261,9 +146,6 @@ See the documentation for `calendar-holidays' for details."
;;;###autoload
(put 'holiday-christian-holidays 'risky-local-variable t)
;;;###autoload
(define-obsolete-variable-alias 'islamic-holidays
'holiday-islamic-holidays "23.1")
;;;###autoload
(defcustom holiday-islamic-holidays
(mapcar 'purecopy
@ -285,8 +167,6 @@ See the documentation for `calendar-holidays' for details."
;;;###autoload
(put 'holiday-islamic-holidays 'risky-local-variable t)
;;;###autoload
(define-obsolete-variable-alias 'bahai-holidays 'holiday-bahai-holidays "23.1")
;;;###autoload
(defcustom holiday-bahai-holidays
(mapcar 'purecopy
@ -308,8 +188,6 @@ See the documentation for `calendar-holidays' for details."
;;;###autoload
(put 'holiday-bahai-holidays 'risky-local-variable t)
;;;###autoload
(define-obsolete-variable-alias 'solar-holidays 'holiday-solar-holidays "23.1")
;;;###autoload
(defcustom holiday-solar-holidays
(mapcar 'purecopy
@ -516,9 +394,6 @@ use instead of point."
(message "Looking up holidays...done"))
holiday-list)))
(define-obsolete-function-alias
'list-calendar-holidays 'calendar-list-holidays "23.1")
;;;###autoload
(defun holidays (&optional arg)
"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."
(if (calendar-date-equal date (car h))
(setq holiday-list (append holiday-list (cdr h)))))))
(define-obsolete-function-alias
'check-calendar-holidays 'calendar-check-holidays "23.1")
;; Formerly cal-tex-list-holidays.
(defun holiday-in-range (d1 d2)
@ -724,9 +596,6 @@ use instead of point."
(calendar-mark-visible-date (car holiday) calendar-holiday-marker))
(message "Marking holidays...done")))
(define-obsolete-function-alias
'mark-calendar-holidays 'calendar-mark-holidays "23.1")
;; Below are the functions that calculate the dates of holidays; these
;; are eval'ed in the function calendar-holiday-list. If you
;; 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."
(and (car p) (calendar-date-is-visible-p (car p)) p))
hlist)))
(define-obsolete-function-alias
'filter-visible-calendar-holidays 'holiday-filter-visible-calendar "23.1")
(defun holiday-sexp (sexp string)
"Sexp holiday for dates in the calendar window.
SEXP is an expression in variable `year' that is evaluated to

34
lisp/calendar/icalendar.el
View file

@ -740,16 +740,6 @@ ISO format: (year month day)."
;; datetime == nil
nil))
(defun icalendar--date-style ()
"Return current calendar date style.
Convenience function to handle transition from old
`european-calendar-style' to new `calendar-date-style'."
(if (boundp 'calendar-date-style)
calendar-date-style
(if (with-no-warnings european-calendar-style)
'european
'american)))
(defun icalendar--datetime-to-diary-date (datetime &optional separator)
"Convert the decoded DATETIME to diary format.
Optional argument SEPARATOR gives the separator between month,
@ -757,7 +747,7 @@ day, and year. If nil a blank character is used as separator.
Call icalendar--datetime-to-*-date according to the current
calendar date style."
(funcall (intern-soft (format "icalendar--datetime-to-%s-date"
(icalendar--date-style)))
calendar-date-style))
datetime separator))
(defun icalendar--datetime-to-colontime (datetime)
@ -867,7 +857,7 @@ is not possible it uses the current calendar date style."
(match-end 2))))
(setq year (read (substring datestring (match-beginning 3)
(match-end 3))))
(if (eq (icalendar--date-style) 'american)
(if (eq calendar-date-style 'american)
(let ((x month))
(setq month day)
(setq day x))))
@ -1451,7 +1441,7 @@ entries. ENTRY-MAIN is the first line of the diary entry."
NONMARKER is a regular expression matching the start of non-marking
entries. ENTRY-MAIN is the first line of the diary entry."
(if (string-match (concat nonmarker
(if (eq (icalendar--date-style) 'european)
(if (eq calendar-date-style 'european)
"\\([0-9]+[0-9]?\\)\\s-+\\([a-z]+\\)\\s-+"
"\\([a-z]+\\)\\s-+\\([0-9]+[0-9]?\\)\\s-+")
"\\*?\\s-*"
@ -1462,8 +1452,8 @@ entries. ENTRY-MAIN is the first line of the diary entry."
"\\s-*\\([^0-9]+.*?\\) ?$" ; must not match years
)
entry-main)
(let* ((daypos (if (eq (icalendar--date-style) 'european) 1 2))
(monpos (if (eq (icalendar--date-style) 'european) 2 1))
(let* ((daypos (if (eq calendar-date-style 'european) 1 2))
(monpos (if (eq calendar-date-style 'european) 2 1))
(day (read (substring entry-main
(match-beginning daypos)
(match-end daypos))))
@ -2300,11 +2290,11 @@ END-T is the event's end time in diary format."
(let ((day (nth 3 dtstart-dec))
(month (nth 4 dtstart-dec)))
(setq result (concat "%%(and (diary-date "
(cond ((eq (icalendar--date-style) 'iso)
(cond ((eq calendar-date-style 'iso)
(format "t %d %d" month day))
((eq (icalendar--date-style) 'european)
((eq calendar-date-style 'european)
(format "%d %d t" day month))
((eq (icalendar--date-style) 'american)
((eq calendar-date-style 'american)
(format "%d %d t" month day)))
") (diary-block "
dtstart-conv
@ -2326,16 +2316,16 @@ END-T is the event's end time in diary format."
(format
"%%%%(and (diary-date %s) (diary-block %s %s)) %s%s%s"
(let ((day (nth 3 dtstart-dec)))
(cond ((eq (icalendar--date-style) 'iso)
(cond ((eq calendar-date-style 'iso)
(format "t t %d" day))
((eq (icalendar--date-style) 'european)
((eq calendar-date-style 'european)
(format "%d t t" day))
((eq (icalendar--date-style) 'american)
((eq calendar-date-style 'american)
(format "t %d t" day))))
dtstart-conv
(if until
until-conv
(if (eq (icalendar--date-style) 'iso) "9999 1 1" "1 1 9999")) ;; FIXME: should be unlimited
(if (eq calendar-date-style 'iso) "9999 1 1" "1 1 9999")) ;; FIXME: should be unlimited
(or start-t "")
(if end-t "-" "") (or end-t ""))))
;; daily

14
lisp/calendar/lunar.el
View file

@ -1,7 +1,6 @@
;;; lunar.el --- calendar functions for phases of the moon
;; Copyright (C) 1992-1993, 1995, 1997, 2001-2014 Free Software
;; Foundation, Inc.
;; Copyright (C) 1992-1993, 1995, 1997, 2001-2014 Free Software Foundation, Inc.
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <rgm@gnu.org>
@ -228,10 +227,6 @@ use instead of point."
(lunar-phase-list m1 y1) "\n")))
(message "Computing phases of the moon...done"))))
;;;###cal-autoload
(define-obsolete-function-alias 'calendar-phases-of-moon
'calendar-lunar-phases "23.1")
;;;###autoload
(defun lunar-phases (&optional arg)
"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."
(displayed-year (calendar-extract-year date)))
(calendar-lunar-phases))))
;;;###autoload
(define-obsolete-function-alias 'phases-of-moon 'lunar-phases "23.1")
(defvar date)
;; To be called from diary-list-sexp-entries, where DATE is bound.
@ -266,10 +258,6 @@ use when highlighting the day in the calendar."
(cons mark (concat (lunar-phase-name (nth 2 phase)) " "
(cadr phase))))))
;;;###diary-autoload
(define-obsolete-function-alias 'diary-phases-of-moon
'diary-lunar-phases "23.1")
;; For the Chinese calendar the calculations for the new moon need to be more
;; accurate than those above, so we use more terms in the approximation.
(defun lunar-new-moon-time (k)

26
lisp/textmodes/remember.el
View file

@ -499,6 +499,8 @@ If this is nil, then `diary-file' will be used instead."
:type '(choice (const :tag "diary-file" nil) file)
:group 'remember)
(defvar calendar-date-style) ; calendar.el
(defun remember-diary-convert-entry (entry)
"Translate MSG to an entry readable by diary."
(save-match-data
@ -511,23 +513,17 @@ If this is nil, then `diary-file' will be used instead."
;; which requires calendar.
(require 'calendar)
(replace-match
(let ((style (if (boundp 'calendar-date-style)
calendar-date-style
;; Don't complain about obsolescence.
(if (with-no-warnings european-calendar-style)
'european
'american))))
(cond ((eq style 'european)
(concat (match-string 3 entry) "/"
(match-string 2 entry) "/"
(match-string 1 entry)))
((eq style 'iso)
(concat (match-string 1 entry) "-"
(cond ((eq calendar-date-style 'european)
(concat (match-string 3 entry) "/"
(match-string 2 entry) "/"
(match-string 1 entry)))
((eq calendar-date-style 'iso)
(concat (match-string 1 entry) "-"
(match-string 2 entry) "-"
(match-string 3 entry)))
(t (concat (match-string 2 entry) "/"
(match-string 3 entry) "/"
(match-string 1 entry)))))
(t (concat (match-string 2 entry) "/"
(match-string 3 entry) "/"
(match-string 1 entry))))
t t entry))
entry)))

5
test/ChangeLog
View file

@ -1,3 +1,8 @@
2014-10-06 Glenn Morris <rgm@gnu.org>
* automated/icalendar-tests.el (icalendar--calendar-style):
Remove test, no longer relevant.
2014-10-04 Glenn Morris <rgm@gnu.org>
* automated/package-x-test.el: Remove file...

12
test/automated/icalendar-tests.el
View file

@ -80,18 +80,6 @@
(should (string= (concat "yyyDTSTARTyyy")
(icalendar--create-uid entry-full contents)))))
(ert-deftest icalendar--calendar-style ()
"Test for `icalendar--date-style'."
(dolist (calendar-date-style '(iso american european))
(should (eq (icalendar--date-style) calendar-date-style)))
(let ((cds calendar-date-style)
(european-calendar-style t))
(makunbound 'calendar-date-style)
(should (eq (icalendar--date-style) 'european))
(with-no-warnings (setq european-calendar-style nil)) ;still get warning!?! FIXME
(should (eq (icalendar--date-style) 'american))
(setq calendar-date-style cds)))
(ert-deftest icalendar-convert-anniversary-to-ical ()
"Test method for `icalendar--convert-anniversary-to-ical'."
(let* ((calendar-date-style 'iso)