Commit 75eb05f6 authored by Miles Bader's avatar Miles Bader
Browse files

Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-385

Remove "-face" suffix from calendar faces

2005-06-10  Miles Bader  <miles@gnu.org>

   * lisp/calendar/calendar.el (diary, calendar-today, holiday)
   (mark-visible-calendar-date): Remove "-face" suffix from face names.
   (diary-face, calendar-today-face, holiday-face):
   New backward-compatibility aliases for renamed faces.
   (eval-after-load "facemenu", diary-entry-marker)
   (calendar-today-marker, calendar-holiday-marker, diary-face):
   Use renamed calendar faces.
parent 37af2dd3
2005-06-10 Miles Bader <miles@gnu.org>
 
* calendar/calendar.el (diary, calendar-today, holiday)
(mark-visible-calendar-date): Remove "-face" suffix from face names.
(diary-face, calendar-today-face, holiday-face):
New backward-compatibility aliases for renamed faces.
(eval-after-load "facemenu", diary-entry-marker)
(calendar-today-marker, calendar-holiday-marker, diary-face):
Use renamed calendar faces.
* compare-w.el (compare-windows): Remove "-face" suffix from face name.
(compare-windows-face): New backward-compatibility alias for
renamed face.
......
......@@ -206,9 +206,9 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
:type 'boolean
:group 'view)
(defvar diary-face 'diary-face
(defvar diary-face 'diary
"Face name to use for diary entries.")
(defface diary-face
(defface diary
'((((min-colors 88) (class color) (background light))
:foreground "red1")
(((class color) (background light))
......@@ -221,13 +221,17 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
:weight bold))
"Face for highlighting diary entries."
:group 'diary)
;; backward-compatibility alias
(put 'diary-face 'face-alias 'diary)
(defface calendar-today-face
(defface calendar-today
'((t (:underline t)))
"Face for indicating today's date."
:group 'diary)
;; backward-compatibility alias
(put 'calendar-today-face 'face-alias 'calendar-today)
(defface holiday-face
(defface holiday
'((((class color) (background light))
:background "pink")
(((class color) (background dark))
......@@ -236,17 +240,19 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
:inverse-video t))
"Face for indicating dates that have holidays."
:group 'diary)
;; backward-compatibility alias
(put 'holiday-face 'face-alias 'holiday)
(eval-after-load "facemenu"
'(progn
(add-to-list 'facemenu-unlisted-faces 'diary-face)
(add-to-list 'facemenu-unlisted-faces 'calendar-today-face)
(add-to-list 'facemenu-unlisted-faces 'holiday-face)))
(add-to-list 'facemenu-unlisted-faces 'diary)
(add-to-list 'facemenu-unlisted-faces 'calendar-today)
(add-to-list 'facemenu-unlisted-faces 'holiday)))
(defcustom diary-entry-marker
(if (not (display-color-p))
"+"
'diary-face)
'diary)
"*How to mark dates that have diary entries.
The value can be either a single-character string or a face."
:type '(choice string face)
......@@ -255,7 +261,7 @@ The value can be either a single-character string or a face."
(defcustom calendar-today-marker
(if (not (display-color-p))
"="
'calendar-today-face)
'calendar-today)
"*How to mark today's date in the calendar.
The value can be either a single-character string or a face.
Marking today's date is done only if you set up `today-visible-calendar-hook'
......@@ -266,7 +272,7 @@ to request that."
(defcustom calendar-holiday-marker
(if (not (display-color-p))
"*"
'holiday-face)
'holiday)
"*How to mark notable dates in the calendar.
The value can be either a single-character string or a face."
:type '(choice string face)
......@@ -2943,7 +2949,7 @@ MARK defaults to `diary-entry-marker'."
(forward-char -2))
(let ; attr list
((temp-face
(make-symbol (apply 'concat "temp-face-"
(make-symbol (apply 'concat "temp-"
(mapcar '(lambda (sym)
(cond ((symbolp sym) (symbol-name sym))
((numberp sym) (int-to-string sym))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment