diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/calendar/diary-lib.el | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f4221b7b7c6..8528460f4f9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-05-07 Glenn Morris <rgm@gnu.org> + * calendar/diary-lib.el (diary-comment-start): Doc fix. + * calendar/appt.el (appt-time-msg-list): Doc fix. 2011-05-06 Noah Friedman <friedman@splode.com> diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 97f2a141610..1e1066028ac 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -147,7 +147,8 @@ See the documentation for the function `diary-list-sexp-entries'." Nil means there are no comments. The diary does not display parts of entries that are inside comments. You can use comments for whatever you like, e.g. for meta-data that packages such as -`appt.el' can use. +`appt.el' can use. Comments may not span mutliple lines, and there +can be only one comment on any line. See also `diary-comment-end'." :version "24.1" :type '(choice (const :tag "No comment" nil) string) @@ -650,6 +651,8 @@ Also removes the region between `diary-comment-start' and string)) ;; Preserve the value with the comments. (or literal (setq literal string)) + ;; Handles multiple comments per entry, so long as each is on + ;; a single line, and each line has no more than one comment. (setq string (replace-regexp-in-string (format "%s.*%s" cstart (regexp-quote diary-comment-end)) "" string))) |