comparison lisp/calendar/calendar.el @ 63221:6e968f79cfbc

Revision: [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-385 Remove "-face" suffix from calendar faces 2005-06-10 Miles Bader <[e-mail]> * 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.

63220:b14224937156

  "*Determine how the calendar mode removes a frame no longer needed.
If nil, make an icon of the frame.  If non-nil, delete the frame."
  :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))
     :foreground "red")
    (((min-colors 88) (class color) (background dark))

     :foreground "yellow")
    (t
     :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))
     :background "chocolate4")
    (t
     :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)
  :group 'diary)

(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'
to request that."
  :type '(choice string face)
  :group 'calendar)

(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)
  :group 'calendar)

                  (delete-char 1)
                  (insert mark)
                  (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))
                                                         (t sym))) mark))))
                   (faceinfo mark))

63221:6e968f79cfbc

  "*Determine how the calendar mode removes a frame no longer needed.
If nil, make an icon of the frame.  If non-nil, delete the frame."
  :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))
     :foreground "red")
    (((min-colors 88) (class color) (background dark))

     :foreground "yellow")
    (t
     :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))
     :background "chocolate4")
    (t
     :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)
  :group 'diary)

(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'
to request that."
  :type '(choice string face)
  :group 'calendar)

(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)
  :group 'calendar)

                  (delete-char 1)
                  (insert mark)
                  (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))
                                                         (t sym))) mark))))
                   (faceinfo mark))