From bdc3df307b9668a915629fa831e661fe2a28bbf7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 9 Feb 2009 07:52:54 +0000 Subject: [PATCH] (diary-entry-marker, calendar-today-marker) (calendar-holiday-marker): Drop test for color display. --- lisp/ChangeLog | 5 +++++ lisp/calendar/calendar.el | 45 +++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2a8914bb471..1dfb5a96f11 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-02-09 Glenn Morris + + * calendar/calendar.el (diary-entry-marker, calendar-today-marker) + (calendar-holiday-marker): Drop test for color display. + 2009-02-08 Glenn Morris * calendar/calendar.el (diary-entry-marker, calendar-today-marker) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 0709a18b4ac..e2cb14827c8 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -250,40 +250,33 @@ See `calendar-holiday-marker'." ;; Backward-compatibility alias. FIXME make obsolete. (put 'holiday-face 'face-alias 'holiday) -;; These don't respect changes in font-lock-mode after loading. - -;; Checking font-lock-mode is broken, since it is a buffer-local -;; variable, and which buffer happens to be current when this file is -;; loaded shouldn't make a difference. One could perhaps check -;; global-font-lock-mode, or font-lock-global-modes; but this feature -;; doesn't use font-lock, so there's no real reason it should respect -;; those either. See bug#2199. -(defcustom diary-entry-marker (if ;(and font-lock-mode - (display-color-p) - 'diary - "+") +;; These briefly checked font-lock-mode, but that is broken, since it +;; is a buffer-local variable, and which buffer happens to be current +;; when this file is loaded shouldn't make a difference. One could +;; perhaps check global-font-lock-mode, or font-lock-global-modes; but +;; this feature doesn't use font-lock, so there's no real reason it +;; should respect those either. See bug#2199. +;; They also used to check display-color-p, but that is a problem if +;; loaded from --daemon. Since BW displays are rare now, this was +;; also taken out. The way to keep it would be to have nil mean do a +;; runtime check whenever this variable is used. +(defcustom diary-entry-marker '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) +The value can be either a single-character string (e.g. \"+\") or a face." + :type '(choice (string :tag "Single character string") face) :group 'diary) -(defcustom calendar-today-marker (if ;(and font-lock-mode - (display-color-p) - 'calendar-today - "=") +(defcustom calendar-today-marker 'calendar-today "How to mark today's date in the calendar. -The value can be either a single-character string or a face. +The value can be either a single-character string (e.g. \"=\") or a face. Used by `calendar-mark-today'." - :type '(choice string face) + :type '(choice (string :tag "Single character string") face) :group 'calendar) -(defcustom calendar-holiday-marker (if ;(and font-lock-mode - (display-color-p) - 'holiday - "*") +(defcustom calendar-holiday-marker '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) +The value can be either a single-character string (e.g. \"*\") or a face." + :type '(choice (string :tag "Single character string") face) :group 'holidays) (define-obsolete-variable-alias 'view-calendar-holidays-initially -- 2.39.5