Mercurial > emacs
changeset 9837:5f99af55890d
Don't supersede attributes for faces `diary-face', `calendar-display-face', or
`holiday-face' if they are already defined.
| author | Edward M. Reingold <reingold@emr.cs.iit.edu> |
|---|---|
| date | Tue, 08 Nov 1994 16:23:32 +0000 |
| parents | 6714a42afa60 |
| children | 5fbd6165b408 |
| files | lisp/calendar/calendar.el |
| diffstat | 1 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/calendar.el Tue Nov 08 15:54:54 1994 +0000 +++ b/lisp/calendar/calendar.el Tue Nov 08 16:23:32 1994 +0000 @@ -151,9 +151,9 @@ "+" (require 'faces) (make-face 'diary-face) - (if (x-display-color-p) - (set-face-foreground 'diary-face "red") - (copy-face 'bold 'diary-face)) + (cond ((face-differs-from-default-p 'diary-face)) + ((x-display-color-p) (set-face-foreground 'diary-face "red")) + (t (copy-face 'bold 'diary-face))) 'diary-face) "*Used to mark dates that have diary entries. Can be either a single-character string or a face.") @@ -163,7 +163,8 @@ "=" (require 'faces) (make-face 'calendar-today-face) - (set-face-underline-p 'calendar-today-face t) + (if (not (face-differs-from-default-p 'calendar-today-face)) + (set-face-underline-p 'calendar-today-face t)) 'calendar-today-face) "*Used to mark today's date. Can be either a single-character string or a face.") @@ -173,9 +174,10 @@ "*" (require 'faces) (make-face 'holiday-face) - (if (x-display-color-p) - (set-face-background 'holiday-face "pink") - (copy-face 'highlight 'holiday-face)) + (cond ((face-differs-from-default-p 'holiday-face)) + ((x-display-color-p) (set-face-background 'holiday-face "pink")) + (t (set-face-background 'holiday-face "black") + (set-face-foreground 'holiday-face "white"))) 'holiday-face) "*Used to mark notable dates in the calendar. Can be either a single-character string or a face.")