[Emacs-diffs] emacs/lisp ChangeLog calendar/diary-lib.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/08/22 19:47:45

Modified files:
        lisp           : ChangeLog 
        lisp/calendar  : diary-lib.el 

Log message:
        (diary-mark-entries-1): Only mark all days of a given name if the
        pattern is not more specific.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15995&r2=1.15996
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/diary-lib.el?cvsroot=emacs&r1=1.183&r2=1.184

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15995
retrieving revision 1.15996
diff -u -b -r1.15995 -r1.15996
--- ChangeLog   22 Aug 2009 19:45:30 -0000      1.15995
+++ ChangeLog   22 Aug 2009 19:47:42 -0000      1.15996
@@ -1,5 +1,8 @@
 2009-08-22  Glenn Morris  <address@hidden>
 
+       * 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.

Index: calendar/diary-lib.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -b -r1.183 -r1.184
--- calendar/diary-lib.el       2 Apr 2009 06:33:18 -0000       1.183
+++ calendar/diary-lib.el       22 Aug 2009 19:47:44 -0000      1.184
@@ -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