# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1206888167 0
# Node ID bc6b2ba17b08d0c603d280dcc5de2a36921cba2c
# Parent  23f00a60178d025de04c1d01e781764e935a8fdb
(remember-diary-convert-entry): Revert last change (ill-conceived).

diff -r 23f00a60178d -r bc6b2ba17b08 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Mar 30 12:52:18 2008 +0000
+++ b/lisp/ChangeLog	Sun Mar 30 14:42:47 2008 +0000
@@ -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 -r 23f00a60178d -r bc6b2ba17b08 lisp/textmodes/remember.el
--- a/lisp/textmodes/remember.el	Sun Mar 30 12:52:18 2008 +0000
+++ b/lisp/textmodes/remember.el	Sun Mar 30 14:42:47 2008 +0000
@@ -481,7 +481,8 @@
         (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)