Mercurial > emacs
changeset 63221:6e968f79cfbc
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.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 10 Jun 2005 10:43:42 +0000 |
| parents | b14224937156 |
| children | cd220f7e47e7 |
| files | lisp/ChangeLog lisp/calendar/calendar.el |
| diffstat | 2 files changed, 27 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jun 10 10:43:24 2005 +0000 +++ b/lisp/ChangeLog Fri Jun 10 10:43:42 2005 +0000 @@ -1,5 +1,13 @@ 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.
--- a/lisp/calendar/calendar.el Fri Jun 10 10:43:24 2005 +0000 +++ b/lisp/calendar/calendar.el Fri Jun 10 10:43:42 2005 +0000 @@ -206,9 +206,9 @@ :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 @@ :weight bold)) "Face for highlighting diary entries." :group 'diary) - -(defface calendar-today-face +;; backward-compatibility alias +(put 'diary-face 'face-alias 'diary) + +(defface calendar-today '((t (:underline t))) "Face for indicating today's date." :group 'diary) - -(defface holiday-face +;; backward-compatibility alias +(put 'calendar-today-face 'face-alias 'calendar-today) + +(defface holiday '((((class color) (background light)) :background "pink") (((class color) (background dark)) @@ -236,17 +240,19 @@ :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 @@ (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 @@ (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 @@ (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))