[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog calendar/calendar.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog calendar/calendar.el |
Date: |
Mon, 09 Feb 2009 07:52:59 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/02/09 07:52:58
Modified files:
lisp : ChangeLog
lisp/calendar : calendar.el
Log message:
(diary-entry-marker, calendar-today-marker)
(calendar-holiday-marker): Drop test for color display.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15284&r2=1.15285
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/calendar.el?cvsroot=emacs&r1=1.277&r2=1.278
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15284
retrieving revision 1.15285
diff -u -b -r1.15284 -r1.15285
--- ChangeLog 8 Feb 2009 01:52:26 -0000 1.15284
+++ ChangeLog 9 Feb 2009 07:52:54 -0000 1.15285
@@ -1,3 +1,8 @@
+2009-02-09 Glenn Morris <address@hidden>
+
+ * calendar/calendar.el (diary-entry-marker, calendar-today-marker)
+ (calendar-holiday-marker): Drop test for color display.
+
2009-02-08 Glenn Morris <address@hidden>
* calendar/calendar.el (diary-entry-marker, calendar-today-marker)
Index: calendar/calendar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -b -r1.277 -r1.278
--- calendar/calendar.el 8 Feb 2009 01:52:01 -0000 1.277
+++ calendar/calendar.el 9 Feb 2009 07:52:58 -0000 1.278
@@ -250,40 +250,33 @@
;; 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
- [Emacs-diffs] emacs/lisp ChangeLog calendar/calendar.el,
Glenn Morris <=