diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-11-11 19:16:20 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-11-11 19:16:20 -0800 |
| commit | 29f30ab772056269970223a358a9ccf0a4711999 (patch) | |
| tree | b3ffa94a2c12fe5e192f6d48ad4748dc5c6d1612 /lisp/calendar | |
| parent | 10b40d2ef6eb3480f36a39168440dd59efca0e97 (diff) | |
| download | emacs-29f30ab772056269970223a358a9ccf0a4711999.tar.gz | |
diary-iso-date-forms fix for bug#7377.
* lisp/calendar/calendar.el (diary-iso-date-forms): Make elements
mutually exclusive.
Diffstat (limited to 'lisp/calendar')
| -rw-r--r-- | lisp/calendar/calendar.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 418f740bb83..24ebb19a58b 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -736,14 +736,16 @@ calendar package is already loaded). Rather, use either (defcustom diary-iso-date-forms '((month "[-/]" day "[^-/0-9]") (year "[-/]" month "[-/]" day "[^0-9]") - (monthname "-" day "[^-0-9]") - (year "-" monthname "-" day "[^0-9]") + ;; Cannot allow [-/] as separators here, since it would also match + ;; the first element (bug#7377). + (monthname " *" day "[^-0-9]") + (year " *" monthname " *" day "[^0-9]") (dayname "\\W")) "List of pseudo-patterns describing the ISO style of dates. -The defaults are: MONTH[-/]DAY; YEAR[-/]MONTH[-/]DAY; MONTHNAME-DAY; -YEAR-MONTHNAME-DAY; DAYNAME. Normally you should not customize this, +The defaults are: MONTH[-/]DAY; YEAR[-/]MONTH[-/]DAY; MONTHNAME DAY; +YEAR MONTHNAME DAY; DAYNAME. Normally you should not customize this, but `diary-date-forms' (which see)." - :version "23.1" + :version "23.3" ; bug#7377 :type '(repeat (choice (cons :tag "Backup" :value (backup . nil) (const backup) @@ -2570,5 +2572,4 @@ If called by a mouse-event, pops up a menu with the result." ;; byte-compile-dynamic: t ;; End: -;; arch-tag: 19c61596-c8fb-4c69-bcf1-7dd739919cd8 ;;; calendar.el ends here |