(diary-list-entries-2): Accept optional Gregorian date, and add it,

not the local date, to diary-entries-list.
(diary-list-entries-1): Pass Gregorian date to diary-list-entries-2.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 826675914dd4a51d2151652e76723cfd041f9d5c..2d1c1a0e7983f9ec1f94379ecf77998ec50424d2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2008-06-11  Glenn Morris  <rgm@gnu.org>
+
+       * progmodes/fortran.el (fortran-end-of-subprogram): Check for a match
+       before trying to move there.
+       (fortran-calculate-indent): When fortran-check-all-num-for-matching-do
+       is non-nil, indent most terminating statements like loop body.
+
+       * calendar/diary-lib.el (diary-list-entries-2): Accept optional
+       Gregorian date, and add it, not the local date, to diary-entries-list.
+       (diary-list-entries-1): Pass Gregorian date to diary-list-entries-2.
+
 2008-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/compile.el (compilation-filter): Fix up last change.

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 9ece770f3241f053550b71536ffa3cc096a81d63..18473d5df57e7aaf01b34f034e23fddacb6bc4f7 100644 (file)
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -616,7 +616,7 @@ FILENAME being the file containing the diary entry."
 (define-obsolete-function-alias 'add-to-diary-list 'diary-add-to-list "23.1")
 
 (defun diary-list-entries-2 (date mark globattr list-only
-                                  &optional months symbol)
+                                  &optional months symbol gdate)
   "Internal subroutine of `diary-list-entries'.
 Find diary entries applying to DATE, by searching from point-min for
 each element of `diary-date-forms'.  MARK indicates an entry is non-marking.
@@ -624,7 +624,9 @@ GLOBATTR is the list of global file attributes.  If LIST-ONLY is
 non-nil, don't change the buffer, only return a list of entries.
 Optional array MONTHS replaces `calendar-month-name-array', and
 means months cannot be abbreviated.  Optional string SYMBOL marks diary
-entries of the desired type.  Returns non-nil if any entries were found."
+entries of the desired type.  If DATE is not Gregorian, then the
+Gregorian equivalent should be provided via GDATE.  Returns non-nil if
+any entries were found."
   (let* ((month (calendar-extract-month date))
          (day (calendar-extract-day date))
          (year (calendar-extract-year date))
@@ -678,7 +680,7 @@ entries of the desired type.  Returns non-nil if any entries were found."
                         (buffer-substring-no-properties
                          entry-start (point)) globattr))
             (diary-add-to-list
-             date (car temp)
+             (or gdate date) (car temp)
              (buffer-substring-no-properties (1+ date-start) (1- entry-start))
              (copy-marker entry-start) (cadr temp))))))
     entry-found))
@@ -697,7 +699,7 @@ of the appropriate type."
     (dotimes (idummy number)
       (diary-list-entries-2
        (funcall absfunc (calendar-absolute-from-gregorian gdate))
-       diary-nonmarking-symbol file-glob-attrs list-only months symbol)
+       diary-nonmarking-symbol file-glob-attrs list-only months symbol gdate)
       (setq gdate
             (calendar-gregorian-from-absolute
              (1+ (calendar-absolute-from-gregorian gdate))))))