mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-25 10:47:00 +00:00
Code Issues Releases Activity

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

Browse Source 
`holiday-face' if they are already defined.
This commit is contained in:
Edward M. Reingold 1994-11-08 16:23:32 +00:00
parent b10fca682f
commit 06f7e2c57a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lisp/calendar/calendar.el
View File

@ -151,9 +151,9 @@ The marking symbol is specified by the variable `diary-entry-marker'.")
"+" "+"
(require 'faces) (require 'faces)
(make-face 'diary-face) (make-face 'diary-face)
(if (x-display-color-p) (cond ((face-differs-from-default-p 'diary-face))
(set-face-foreground 'diary-face "red") ((x-display-color-p) (set-face-foreground 'diary-face "red"))
(copy-face 'bold 'diary-face)) (t (copy-face 'bold 'diary-face)))
'diary-face) 'diary-face)
"*Used to mark dates that have diary entries. "*Used to mark dates that have diary entries.
Can be either a single-character string or a face.") 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) (require 'faces)
(make-face 'calendar-today-face) (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) 'calendar-today-face)
"*Used to mark today's date. "*Used to mark today's date.
Can be either a single-character string or a face.") 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) (require 'faces)
(make-face 'holiday-face) (make-face 'holiday-face)
(if (x-display-color-p) (cond ((face-differs-from-default-p 'holiday-face))
(set-face-background 'holiday-face "pink") ((x-display-color-p) (set-face-background 'holiday-face "pink"))
(copy-face 'highlight 'holiday-face)) (t (set-face-background 'holiday-face "black")
(set-face-foreground 'holiday-face "white")))
'holiday-face) 'holiday-face)
"*Used to mark notable dates in the calendar. "*Used to mark notable dates in the calendar.
Can be either a single-character string or a face.") Can be either a single-character string or a face.")