Mercurial > emacs
changeset 111606:0466e5504621
diary-iso-date-forms fix for bug#7377.
* lisp/calendar/calendar.el (diary-iso-date-forms): Make elements
mutually exclusive.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 11 Nov 2010 19:16:20 -0800 |
| parents | ca8b605ca70f |
| children | 71ea229e4709 |
| files | lisp/ChangeLog lisp/calendar/calendar.el |
| diffstat | 2 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 11 20:33:28 2010 -0500 +++ b/lisp/ChangeLog Thu Nov 11 19:16:20 2010 -0800 @@ -1,3 +1,8 @@ +2010-11-12 Glenn Morris <rgm@gnu.org> + + * calendar/calendar.el (diary-iso-date-forms): Make elements + mutually exclusive. (Bug#7377) + 2010-11-12 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/smie.el (smie-prec2->grammar): Obey equality constraints
--- a/lisp/calendar/calendar.el Thu Nov 11 20:33:28 2010 -0500 +++ b/lisp/calendar/calendar.el Thu Nov 11 19:16:20 2010 -0800 @@ -736,14 +736,16 @@ (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 @@ ;; byte-compile-dynamic: t ;; End: -;; arch-tag: 19c61596-c8fb-4c69-bcf1-7dd739919cd8 ;;; calendar.el ends here