(remember-diary-convert-entry): Revert last change (ill-conceived).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34f3e0df1ba11a7ffd7e6bc990324d6fd18f772e..937b98f4c0f585831b43622d7cb081f722804816 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * textmodes/remember.el (remember-diary-convert-entry): Revert last
+       change (ill-conceived).
+
 2008-03-29  Glenn Morris  <rgm@gnu.org>
 
        * calendar/cal-hebrew.el (holiday-hebrew): Simplify.

diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 317ddd43adb446c914d5132fe8fb8a03a5d912bf..1fd830afac706faae04d9fdc3820e313ab712204 100644 (file)
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -481,7 +481,8 @@ If this is nil, then `diary-file' will be used instead."
         (replace-match
          (let ((style (if (boundp 'calendar-date-style)
                           calendar-date-style
-                        (if (bound-and-true-p european-calendar-style)
+                        ;; Don't complain about obsoleteness.
+                        (if (with-no-warnings european-calendar-style)
                             'european
                           'american))))
            (cond ((eq style 'european)