[Emacs-diffs] Changes to emacs/lisp/textmodes/remember.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/04/08 07:35:47

Index: remember.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/remember.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- remember.el 30 Mar 2008 14:42:47 -0000      1.16
+++ remember.el 8 Apr 2008 07:35:47 -0000       1.17
@@ -478,6 +478,11 @@
     (when remember-annotation
         (setq entry (concat entry " " remember-annotation)))
     (if (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)" entry)
+        (progn
+          ;; For calendar-date-style.  This costs us nothing because
+          ;; the call to make-diary-entry below loads diary-lib
+          ;; which requires calendar.
+          (require 'calendar)
         (replace-match
          (let ((style (if (boundp 'calendar-date-style)
                           calendar-date-style
@@ -496,7 +501,7 @@
                  (t (concat (match-string 2 entry) "/"
                             (match-string 3 entry) "/"
                             (match-string 1 entry)))))
-         t t entry)
+           t t entry))
       entry)))
 
 (autoload 'make-diary-entry "diary-lib")