changeset 52160:833b56d6e12d

(list-diary-entries-hook, diary-display-hook, nongregorian-diary-listing-hook) (mark-diary-entries-hook, nongregorian-diary-marking-hook): Add some customize options for these hooks. (calendar-abbrev-construct): Don't try to take a substring longer than the original string.

--- a/lisp/calendar/calendar.el	Wed Aug 06 03:17:37 2003 +0000
+++ b/lisp/calendar/calendar.el	Wed Aug 06 10:10:12 2003 +0000
@@ -753,6 +753,7 @@
 diary entries from various included files, each day's entries sorted into
 lexicographic order."
   :type 'hook
+  :options '(include-other-diary-files sort-diary-entries)
   :group 'diary)
 
 ;;;###autoload
@@ -785,6 +786,7 @@
 if that day is a holiday; if you want such days to be shown in the fancy
 diary buffer, set the variable `diary-list-include-blanks' to t."
   :type 'hook
+  :options '(fancy-diary-display)
   :group 'diary)
 
 ;;;###autoload
@@ -795,6 +797,7 @@
 and `list-islamic-diary-entries'.  The documentation for these functions
 describes the style of such diary entries."
   :type 'hook
+  :options '(list-hebrew-diary-entries list-islamic-diary-entries)
   :group 'diary)
 
 ;;;###autoload
@@ -812,6 +815,7 @@
 part of the mark-diary-entries-hook, you will probably also want to use the
 function `include-other-diary-files' as part of `list-diary-entries-hook'."
   :type 'hook
+  :options '(mark-included-diary-files)
   :group 'diary)
 
 ;;;###autoload
@@ -822,6 +826,7 @@
 and `mark-islamic-diary-entries'.  The documentation for these functions
 describes the style of such diary entries."
   :type 'hook
+  :options '(mark-hebrew-diary-entries mark-islamic-diary-entries)
   :group 'diary)
 
 ;;;###autoload
@@ -2564,10 +2569,12 @@
 elements replaced by the first three characters taken from the
 corresponding element of FULL.  If optional argument PERIOD is non-nil,
 each element returned has a final `.' character."
-  (let (elem array)
+  (let (elem array name)
     (dotimes (i (length full))
-      (setq elem (or (aref abbrev i)
-                     (substring (aref full i) 0 calendar-abbrev-length))
+      (setq name (aref full i)
+            elem (or (aref abbrev i)
+                     (substring name 0
+                                (min calendar-abbrev-length (length name))))
             elem (format "%s%s" elem (if period "." ""))
             array (append array (list elem))))
     (vconcat array)))