From: Andreas Merziger <andreas.merziger@online.de>
Date: Fri, 16 Aug 2019 01:39:27 +0000 (-0700)
Subject: Make diary-european-date-forms elements mutually exclusive
X-Git-Tag: emacs-27.0.90~1601
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3393364b6b925ec6ad4b2570ed8ea5358170b312;p=emacs.git

Make diary-european-date-forms elements mutually exclusive

* lisp/calendar/calendar.el (diary-european-date-forms): Make the
elements mutually exclusive (bug#13536).
---

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 14604a673d0..e7a7bd47d61 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -799,7 +799,7 @@ but `diary-date-forms' (which see)."
   '((day "/" month "[^/0-9]")
     (day "/" month "/" year "[^0-9]")
     (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|\\([0-9]+[:aApP]\\)\\)")
-    (day " *" monthname " *" year "[^0-9]")
+    (day " *" monthname " *" year "[^0-9:aApP]")
     (dayname "\\W"))
   "List of pseudo-patterns describing the European style of dates.
 The defaults are: DAY/MONTH; DAY/MONTH/YEAR; DAY MONTHNAME;