Commit 06f7e2c5 authored by Edward M. Reingold's avatar Edward M. Reingold
Browse files

Don't supersede attributes for faces `diary-face', `calendar-display-face', or

`holiday-face' if they are already defined.
parent b10fca68
......@@ -151,9 +151,9 @@ The marking symbol is specified by the variable `diary-entry-marker'.")
"+"
(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 @@ Can be either a single-character string or a face.")
"="
(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 @@ Can be either a single-character string or a face.")
"*"
(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.")
......
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