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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/03/29 02:45:02

Index: remember.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/remember.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- remember.el 24 Mar 2008 02:53:05 -0000      1.13
+++ remember.el 29 Mar 2008 02:45:02 -0000      1.14
@@ -479,13 +479,22 @@
         (setq entry (concat entry " " remember-annotation)))
     (if (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)" entry)
         (replace-match
-         (if european-calendar-style
+         (let ((style (if (boundp 'calendar-date-style)
+                          calendar-date-style
+                        (if (with-no-warnings european-calendar-style)
+                            'european
+                          'american))))
+           (cond ((eq style 'european)
              (concat (match-string 3 entry) "/"
                      (match-string 2 entry) "/"
-                     (match-string 1 entry))
-           (concat (match-string 2 entry) "/"
-                   (match-string 3 entry) "/"
                    (match-string 1 entry)))
+                 ((eq style 'iso)
+                  (concat (match-string 1 entry) "-"
+                          (match-string 2 entry) "-"
+                          (match-string 3 entry)))
+                 (t (concat (match-string 2 entry) "/"
+                            (match-string 3 entry) "/"
+                            (match-string 1 entry)))))
          t t entry)
       entry)))