From 3d880a4b894daa1c0f7068e8e2b59634046bcb3b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 6 Aug 2003 10:10:46 +0000 Subject: [PATCH] (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. --- lisp/ChangeLog | 9 +++++++++ lisp/calendar/calendar.el | 13 ++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bcf09a81bba..2d6e31a44b7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2003-08-06 Glenn Morris + + * calendar/calendar.el (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. + 2003-08-05 Richard M. Stallman * emacs-lisp/testcover.el (noreturn): Report error if does return. diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 88d389072c2..e99e0b09d51 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -753,6 +753,7 @@ in your `.emacs' file to cause the fancy diary buffer to be displayed with 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 @@ diary buffer will not show days for which there are no diary entries, even 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 @@ relevant entries. You can use either or both of `list-hebrew-diary-entries' 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 @@ variable `diary-include-string'. When you use `mark-included-diary-files' as 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 @@ relevant entries. You can use either or both of `mark-hebrew-diary-entries' 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 @@ of full names. The return value is the ABBREV array, with any nil 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))) -- 2.11.4.GIT