# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1250970462 0
# Node ID d787a9b6a87e51f5d8ce013776bda43eb60b2eb5
# Parent  8c67d84c0faabd207a3c399d973e85b6f67017ec
(diary-mark-entries-1): Only mark all days of a given name if the
pattern is not more specific.

diff -r 8c67d84c0faa -r d787a9b6a87e lisp/ChangeLog
--- 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.
diff -r 8c67d84c0faa -r d787a9b6a87e lisp/calendar/diary-lib.el
--- 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