Mercurial > emacs
comparison lisp/calendar/diary-lib.el @ 111728:3d2a49995aff
* lisp/calendar/diary-lib.el (diary-outlook-format-1): Another fix.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 25 Nov 2010 19:19:58 -0800 |
parents | 997260859cca |
children | f5f8ce99f766 |
comparison
equal
deleted
inserted
replaced
111727:997260859cca | 111728:3d2a49995aff |
---|---|
321 (throw 'found (1+ i)))) | 321 (throw 'found (1+ i)))) |
322 nil))) | 322 nil))) |
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 |
331 (t "\\1 \\2 \\3"))) ; MDY | 330 (t "\\1 \\2 \\3"))) ; MDY |
332 "\n \\4 %s, \\5"))) | 331 "\n \\4 %s, \\5"))) |