From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 30 Mar 2008 14:42:47 +0000 (+0000)
Subject: (remember-diary-convert-entry): Revert last change (ill-conceived).
X-Git-Tag: emacs-pretest-23.0.90~6769
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c9389edfdf5993f1c159311c8032553897b03de5;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34f3e0df1ba..937b98f4c0f 100644
--- 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 317ddd43adb..1fd830afac7 100644
--- 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)