]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix diary not displaying some entries in european style
authorMichael Heerdegen <michael_heerdegen@web.de>
Wed, 2 Feb 2022 00:08:43 +0000 (01:08 +0100)
committerEshel Yaron <me@eshelyaron.com>
Sun, 23 Feb 2025 08:22:00 +0000 (09:22 +0100)
* lisp/calendar/calendar.el (diary-european-date-forms): Correctly
recognize times using a dot as separator.  (Bug#53702)

(cherry picked from commit 8b0043ffd609344f714ba962f82624128e662011)

lisp/calendar/calendar.el

index c519644ae58198e549b75ac11ffe9705d6aaaa65..79f16800c12638f11c44cda5e1b388234c3d8bd6 100644 (file)
@@ -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)