(diary-mark-entries-1): Only mark all days of a given name if the

pattern is not more specific.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce2c1463b29b4fd077dc233ee7e67d85044a2916..cbd9f90e11ee8125fb57f6c92d334dd25007f576 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 0081170d8ac7a51954343b9eb0664e36553c3dc6..ac608517e0f433ea61824e7e9d62f602b9ec54cc 100644 (file)
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1246,7 +1246,9 @@ function that converts absolute dates to dates of the appropriate type.  "
                                (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