Mercurial > emacs
changeset 104548:d787a9b6a87e
(diary-mark-entries-1): Only mark all days of a given name if the
pattern is not more specific.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 22 Aug 2009 19:47:42 +0000 |
| parents | 8c67d84c0faa |
| children | 9605b4808a63 |
| files | lisp/ChangeLog lisp/calendar/diary-lib.el |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Aug 22 19:45:30 2009 +0000 +++ b/lisp/ChangeLog Sat Aug 22 19:47:42 2009 +0000 @@ -1,5 +1,8 @@ 2009-08-22 Glenn Morris <rgm@gnu.org> + * calendar/diary-lib.el (diary-mark-entries-1): Only mark all days of a + given name if the pattern is not more specific. + * calendar/lunar.el (lunar-phase-names): New option. (lunar-phase): Doc fix. (lunar-cycles-per-year): New constant.
--- a/lisp/calendar/diary-lib.el Sat Aug 22 19:45:30 2009 +0000 +++ b/lisp/calendar/diary-lib.el Sat Aug 22 19:47:42 2009 +0000 @@ -1246,7 +1246,9 @@ (buffer-substring-no-properties (point) (line-end-position)) file-glob-attrs))) - (if dd-name + ;; Only mark all days of a given name if the pattern + ;; contains no more specific elements. + (if (and dd-name (not (or d-pos m-pos y-pos))) (calendar-mark-days-named (cdr (assoc-string dd-name (calendar-make-alist