summaryrefslogtreecommitdiff
path: root/lisp/calendar
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2009-08-31 01:33:43 +0000
committerGlenn Morris <rgm@gnu.org>2009-08-31 01:33:43 +0000
commitd8bc5d08e64c10ef2b49cb747d1476fba484fe74 (patch)
tree4a3634a06fbacf09ef62f703c9017902f4df89b5 /lisp/calendar
parent19b72ab7bca617b0d5b66ec80349d76c5e2a271c (diff)
downloademacs-d8bc5d08e64c10ef2b49cb747d1476fba484fe74.tar.gz
(calendar-today): Doc fix.
(calendar-today-face, diary-face, holiday-face): Mark these face aliases as obsolete.
Diffstat (limited to 'lisp/calendar')
-rw-r--r--lisp/calendar/calendar.el15
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index d601cf6a22c..2140e538492 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -214,10 +214,10 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
(defface calendar-today
'((t (:underline t)))
"Face for indicating today's date in the calendar.
-See `calendar-today-marker'."
+See the variable `calendar-today-marker'."
:group 'calendar-faces)
-;; Backward-compatibility alias. FIXME make obsolete.
-(put 'calendar-today-face 'face-alias 'calendar-today)
+
+(define-obsolete-face-alias 'calendar-today-face 'calendar-today "22.1")
(defface diary
'((((min-colors 88) (class color) (background light))
@@ -234,8 +234,8 @@ See `calendar-today-marker'."
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)
-;; Backward-compatibility alias. FIXME make obsolete.
-(put 'diary-face 'face-alias 'diary)
+
+(define-obsolete-face-alias 'diary-face 'diary "22.1")
(defface holiday
'((((class color) (background light))
@@ -247,8 +247,8 @@ and to highlight the date header in the fancy diary."
"Face for indicating in the calendar dates that have holidays.
See `calendar-holiday-marker'."
:group 'calendar-faces)
-;; Backward-compatibility alias. FIXME make obsolete.
-(put 'holiday-face 'face-alias 'holiday)
+
+(define-obsolete-face-alias 'holiday-face 'holiday "22.1")
;; These briefly checked font-lock-mode, but that is broken, since it
;; is a buffer-local variable, and which buffer happens to be current
@@ -2337,6 +2337,7 @@ The date is marked with `calendar-today-marker'. You might want to add
this function to `calendar-today-visible-hook'."
(calendar-mark-visible-date (calendar-cursor-to-date) calendar-today-marker))
+;; FIXME why the car? Almost every usage calls list on the args.
(defun calendar-date-compare (date1 date2)
"Return t if DATE1 is before DATE2, nil otherwise.
The actual dates are in the car of DATE1 and DATE2."