Remove some obsolete calendar functions and variables

* lisp/calendar/cal-tex.el (cal-tex-list-holidays):
Remove alias, obsolete since 24.4.
* lisp/calendar/calendar.el (calendar-mode):
No longer use calendar-font-lock-keywords.
(calendar-font-lock-keywords): Delete variable, obsolete since 24.4.
; * lisp/calendar/holidays.el: Comment.

diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 552832b4834f5b315f8ed9be4d94e38996170965..7ae0ecb767049279debafaac141e55ce65fc5d09 100644 (file)
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -246,8 +246,6 @@ This definition is the heart of the calendar!")
 
 (autoload 'holiday-in-range "holidays")
 
-(define-obsolete-function-alias 'cal-tex-list-holidays 'holiday-in-range "24.3")
-
 (autoload 'diary-list-entries "diary-lib")
 
 (defun cal-tex-list-diary-entries (d1 d2)

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 97acfab326b1fbdd08fa6f647aabfd46415409c7..bfe533fd607c866f2a795837819b97422be099d8 100644 (file)
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1786,10 +1786,7 @@ For a complete description, see the info node `Calendar/Diary'.
   ;; so let's make sure they're always set.  Most likely, this will be reset
   ;; soon in calendar-generate, but better safe than sorry.
   (unless (boundp 'displayed-month) (setq displayed-month 1))
-  (unless (boundp 'displayed-year)  (setq displayed-year  2001))
-  (if (bound-and-true-p calendar-font-lock-keywords)
-      (set (make-local-variable 'font-lock-defaults)
-           '(calendar-font-lock-keywords t))))
+  (unless (boundp 'displayed-year)  (setq displayed-year  2001)))
 
 (defun calendar-string-spread (strings char length)
   "Concatenate list of STRINGS separated with copies of CHAR to fill LENGTH.
@@ -2307,13 +2304,6 @@ Negative years are interpreted as years BC; -1 being 1 BC, and so on."
   (+ (* 12 (- yr2 yr1))
      (- mon2 mon1)))
 
-(defvar calendar-font-lock-keywords nil
-  "Default keywords to highlight in Calendar mode.")
-
-(make-obsolete-variable 'calendar-font-lock-keywords
-                        "set font-lock keywords in `calendar-mode-hook', \
-or customize calendar faces." "24.4")
-
 (defun calendar-day-name (date &optional abbrev absolute)
   "Return a string with the name of the day of the week of DATE.
 DATE should be a list in the format (MONTH DAY YEAR), unless the

diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 8e2a6c96551fb146b29b223204e6f69dd7ce7a94..198c3bb087fecb2c992377bbeb0777000baee562 100644 (file)
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -522,7 +522,6 @@ strings describing those holidays that apply on DATE, or nil if none do."
           (setq holiday-list (append holiday-list (cdr h)))))))
 
 
-;; Formerly cal-tex-list-holidays.
 (defun holiday-in-range (d1 d2)
   "Generate a list of all holidays in range from absolute date D1 to D2."
   (let* ((start (calendar-gregorian-from-absolute d1))