[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100201: diary-iso-date-forms fix for bug#7377.

[Glenn Morris]

------------------------------------------------------------
revno: 100201
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Thu 2010-11-11 19:16:20 -0800
message:
  diary-iso-date-forms fix for bug#7377.
  
  * lisp/calendar/calendar.el (diary-iso-date-forms): Make elements
  mutually exclusive.
modified:
  lisp/ChangeLog
  lisp/calendar/calendar.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-12 01:33:28 +0000
+++ b/lisp/ChangeLog    2010-11-12 03:16:20 +0000
@@ -1,3 +1,8 @@
+2010-11-12  Glenn Morris  <address@hidden>
+
+       * calendar/calendar.el (diary-iso-date-forms): Make elements
+       mutually exclusive.  (Bug#7377)
+
 2010-11-12  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/smie.el (smie-prec2->grammar): Obey equality constraints

=== modified file 'lisp/calendar/calendar.el'
--- a/lisp/calendar/calendar.el 2010-07-10 23:34:57 +0000
+++ b/lisp/calendar/calendar.el 2010-11-12 03:16:20 +0000
@@ -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