aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-11-25 19:19:58 -0800
committerGlenn Morris2010-11-25 19:19:58 -0800
commite5468a779dbc268c41ac10cd24d047c893502a2c (patch)
tree86145d01e83201db5ccaeaa0bb450f36179acc0d
parent92c56fe7fd59e7bb8c374c71db82f3a941e47181 (diff)
downloademacs-e5468a779dbc268c41ac10cd24d047c893502a2c.tar.gz
emacs-e5468a779dbc268c41ac10cd24d047c893502a2c.zip
* lisp/calendar/diary-lib.el (diary-outlook-format-1): Another fix.
-rw-r--r--lisp/calendar/diary-lib.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 159682c2e63..1623ff10197 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -323,8 +323,7 @@ Returns a string using match elements 1-5, where:
323 ;; If we could convert the monthname to a numeric month, we can 323 ;; If we could convert the monthname to a numeric month, we can
324 ;; use the standard function calendar-date-string. 324 ;; use the standard function calendar-date-string.
325 (concat (if month 325 (concat (if month
326 (calendar-date-string (list (string-to-number month) 326 (calendar-date-string (list month (string-to-number day)
327 (string-to-number day)
328 (string-to-number year))) 327 (string-to-number year)))
329 (cond ((eq calendar-date-style 'iso) "\\3 \\1 \\2") ; YMD 328 (cond ((eq calendar-date-style 'iso) "\\3 \\1 \\2") ; YMD
330 ((eq calendar-date-style 'european) "\\2 \\1 \\3") ; DMY 329 ((eq calendar-date-style 'european) "\\2 \\1 \\3") ; DMY