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.

1 files changed, 2 insertions, 115 deletions

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 17937c87fc9..954cb5102bf 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -48,13 +48,6 @@ are holidays."
   :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',
@@ -2141,9 +2064,6 @@ If omitted, NONMARKING defaults to nil and FILE defaults to
    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.
 Prefix argument ARG makes the entry nonmarking."
@@ -2153,9 +2073,6 @@ Prefix argument ARG makes the entry nonmarking."
                     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.
 Prefix argument ARG makes the entry nonmarking."
@@ -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'."
@@ -2222,10 +2135,6 @@ Prefix argument ARG makes the entry nonmarking."
   (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.
 Prefix argument ARG makes the entry nonmarking."
@@ -2233,10 +2142,6 @@ Prefix argument ARG makes the entry nonmarking."
   (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.
 Prefix argument ARG makes the entry nonmarking."
@@ -2249,10 +2154,6 @@ Prefix argument ARG makes the entry nonmarking."
      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.
 Prefix argument ARG makes the entry nonmarking."
@@ -2276,10 +2177,6 @@ Prefix argument ARG makes the entry nonmarking."
      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.
 Prefix argument ARG makes the entry nonmarking."
@@ -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