(remember-diary-convert-entry): Prefer boundp to with-no-warnings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b0c18b60bc0c6df52edf9415a6d0101990396c6..50d418df4a21e097b2e40cb9d44dd993db082768 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * textmodes/remember.el (remember-diary-convert-entry): Prefer boundp
+       to with-no-warnings.
+
 2008-03-29  Michael Albinus  <michael.albinus@gmx.de>
 
        Sync with Tramp 2.1.13.

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