summaryrefslogtreecommitdiff
path: root/lisp/calendar/cal-html.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-05-17 20:20:13 -0700
committerGlenn Morris <rgm@gnu.org>2011-05-17 20:20:13 -0700
commite565dd3789e0ef5589035034893d99de239c87a2 (patch)
treeb28b46a59e1bcbce370f4928f7c380566420ad47 /lisp/calendar/cal-html.el
parent3c24731f34709a8a3ed11a5546ff6b0c7a958f2a (diff)
downloademacs-e565dd3789e0ef5589035034893d99de239c87a2.tar.gz
Rationalize calendar handling of day and month abbrev-arrays.
* lisp/calendar/calendar.el (calendar-customized-p): New function. (calendar-abbrev-construct, calendar-make-alist): Change what it does. (calendar-day-name-array, calendar-month-name-array): Doc fix. Add :set function. (calendar-abbrev-length, calendar-day-abbrev-array) (calendar-month-abbrev-array): Make defcustoms, with appropriate :set. (calendar-day-abbrev-array, calendar-month-abbrev-array): Elements may no longer be nil. (calendar-day-name, calendar-month-name): Update for changed nature of abbrev arrays. * calendar/diary-lib.el (diary-name-pattern): Update for changed nature of abbrev arrays. (diary-mark-entries-1): Update calendar-make-alist calls. (diary-font-lock-date-forms): Doc fix for changed abbrev arrays. * calendar/cal-html.el (cal-html-day-abbrev-array): Simply inherit from calendar-day-abbrev-array. * etc/NEWS: Mention this.
Diffstat (limited to 'lisp/calendar/cal-html.el')
-rw-r--r--lisp/calendar/cal-html.el13
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/calendar/cal-html.el b/lisp/calendar/cal-html.el
index bcc19ccda0b..580b953170c 100644
--- a/lisp/calendar/cal-html.el
+++ b/lisp/calendar/cal-html.el
@@ -54,11 +54,16 @@
:type 'integer
:group 'calendar-html)
-(defcustom cal-html-day-abbrev-array
- (calendar-abbrev-construct calendar-day-abbrev-array
- calendar-day-name-array)
+(defcustom cal-html-day-abbrev-array calendar-day-abbrev-array
"Array of seven strings for abbreviated day names (starting with Sunday)."
- :type '(vector string string string string string string string)
+ :set-after '(calendar-day-abbrev-array)
+ :type '(vector (string :tag "Sun")
+ (string :tag "Mon")
+ (string :tag "Tue")
+ (string :tag "Wed")
+ (string :tag "Thu")
+ (string :tag "Fri")
+ (string :tag "Sat"))
:group 'calendar-html)
(defcustom cal-html-css-default