(remember-diary-extract-entries): Don't pass diary-file, since it is

the default for make-diary-entry anyway.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e53db5f3aafa095e76a78fe98c3d850f0946de6..1ff7f3d94b259be9df22deefe818527f77184681 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,9 @@
        * textmodes/remember.el (remember-diary-convert-entry):
        Require calendar.
 
+       * textmodes/remember.el (remember-diary-extract-entries): Don't pass
+       diary-file, since it is the default for make-diary-entry anyway.
+
        * calendar/cal-menu.el (cal-menu-event-to-date):
        Rename calendar-event-to-date.  Update callers.
        (calendar-mouse-tex-day): Rename cal-tex-mouse-day.

diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index e1c31f4a2b343d8dc549805b5b2db2972645f52e..d396c30a1a6d1e8b65f49723539cd6a24af1ea57 100644 (file)
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -516,7 +516,7 @@ If this is nil, then `diary-file' will be used instead."
         (add-to-list 'list (remember-diary-convert-entry (match-string 1))))
       (when list
         (make-diary-entry (mapconcat 'identity list "\n")
-                          nil (or remember-diary-file diary-file)))
+                          nil remember-diary-file))
       nil))) ;; Continue processing
 
 ;;; Internal Functions: