Index: emacs/lisp/calendar/calendar.el
diff -c emacs/lisp/calendar/calendar.el:1.170
emacs/lisp/calendar/calendar.el:1.171
*** emacs/lisp/calendar/calendar.el:1.170 Thu May 26 20:48:37 2005
--- emacs/lisp/calendar/calendar.el Fri Jun 10 10:43:42 2005
***************
*** 206,214 ****
:type 'boolean
:group 'view)
! (defvar diary-face 'diary-face
"Face name to use for diary entries.")
! (defface diary-face
'((((min-colors 88) (class color) (background light))
:foreground "red1")
(((class color) (background light))
--- 206,214 ----
:type 'boolean
:group 'view)
! (defvar diary-face 'diary
"Face name to use for diary entries.")
! (defface diary
'((((min-colors 88) (class color) (background light))
:foreground "red1")
(((class color) (background light))
***************
*** 221,233 ****
:weight bold))
"Face for highlighting diary entries."
:group 'diary)
! (defface calendar-today-face
'((t (:underline t)))
"Face for indicating today's date."
:group 'diary)
! (defface holiday-face
'((((class color) (background light))
:background "pink")
(((class color) (background dark))
--- 221,237 ----
:weight bold))
"Face for highlighting diary entries."
:group 'diary)
+ ;; backward-compatibility alias
+ (put 'diary-face 'face-alias 'diary)
! (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
'((((class color) (background light))
:background "pink")
(((class color) (background dark))
***************
*** 236,252 ****
:inverse-video t))
"Face for indicating dates that have holidays."
:group 'diary)
(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)))
(defcustom diary-entry-marker
(if (not (display-color-p))
"+"
! 'diary-face)
"*How to mark dates that have diary entries.
The value can be either a single-character string or a face."
:type '(choice string face)
--- 240,258 ----
: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)
! (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)
"*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,261 ****
(defcustom calendar-today-marker
(if (not (display-color-p))
"="
! 'calendar-today-face)
"*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'
--- 261,267 ----
(defcustom calendar-today-marker
(if (not (display-color-p))
"="
! '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,272 ****
(defcustom calendar-holiday-marker
(if (not (display-color-p))
"*"
! 'holiday-face)
"*How to mark notable dates in the calendar.
The value can be either a single-character string or a face."
:type '(choice string face)
--- 272,278 ----
(defcustom calendar-holiday-marker
(if (not (display-color-p))
"*"
! '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,2949 ****
(forward-char -2))
(let ; attr list
((temp-face
! (make-symbol (apply 'concat "temp-face-"
(mapcar '(lambda (sym)
(cond ((symbolp sym)
(symbol-name sym))
((numberp sym)
(int-to-string sym))
--- 2949,2955 ----
(forward-char -2))
(let ; attr list
((temp-face
! (make-symbol (apply 'concat "temp-"
(mapcar '(lambda (sym)
(cond ((symbolp sym)
(symbol-name sym))
((numberp sym)
(int-to-string sym))
_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-diffs
