From: Glenn Morris <rgm@gnu.org>
Date: Tue, 8 Apr 2008 07:49:03 +0000 (+0000)
Subject: (remember-diary-extract-entries): Don't pass diary-file, since it is
X-Git-Tag: emacs-pretest-23.0.90~6444
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=612b05921fb2a0188109591adb2e44eba0c9c63b;p=emacs.git

(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 9e53db5f3aa..1ff7f3d94b2 100644
--- 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 e1c31f4a2b3..d396c30a1a6 100644
--- 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: