From: Michael Heerdegen Date: Wed, 2 Feb 2022 00:08:43 +0000 (+0100) Subject: Fix diary not displaying some entries in european style X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a9aeee767e3675d569cb7b16f9fafdd5aa3aa5a9;p=emacs.git Fix diary not displaying some entries in european style * lisp/calendar/calendar.el (diary-european-date-forms): Correctly recognize times using a dot as separator. (Bug#53702) (cherry picked from commit 8b0043ffd609344f714ba962f82624128e662011) --- diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index c519644ae58..79f16800c12 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -813,8 +813,8 @@ but `diary-date-forms' (which see)." (defcustom diary-european-date-forms '((day "/" month "[^/0-9]") (day "/" month "/" year "[^0-9]") - (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|\\([0-9]+[:aApP]\\)\\)") - (day " *" monthname " *" year "[^0-9:aApP]") + (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|\\([0-9]+[:.aApP]\\)\\)") + (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; @@ -829,7 +829,8 @@ DAY MONTHNAME YEAR; DAYNAME. Normally you should not customize this, but (repeat (list :inline t :format "%v" (symbol :tag "Keyword") (choice symbol regexp))))) - :group 'diary) + :group 'diary + :version "31.1") (defvar diary-font-lock-keywords)