summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2008-04-08 07:49:03 +0000
committerGlenn Morris <rgm@gnu.org>2008-04-08 07:49:03 +0000
commit612b05921fb2a0188109591adb2e44eba0c9c63b (patch)
tree0507ab81e938dd91fcdc9863bbc8000b074cf9d1
parent3f651ee61bc1e8ea25890d7d9b1118d5609a4256 (diff)
downloademacs-612b05921fb2a0188109591adb2e44eba0c9c63b.tar.gz
emacs-612b05921fb2a0188109591adb2e44eba0c9c63b.tar.bz2
emacs-612b05921fb2a0188109591adb2e44eba0c9c63b.zip
(remember-diary-extract-entries): Don't pass diary-file, since it is
the default for make-diary-entry anyway.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/textmodes/remember.el2
2 files changed, 4 insertions, 1 deletions
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: