From a677bd3adcb56d3a31f52f0cbf9db05b590a2046 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sun, 20 Mar 2016 17:45:56 +0000 Subject: [PATCH] dot/emacs: Fix the date-format regexps to not eat a following time. Organization: Straylight/Edgeware From: Mark Wooding --- dot/emacs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dot/emacs b/dot/emacs index d4a313e..dc3da9b 100644 --- a/dot/emacs +++ b/dot/emacs @@ -385,13 +385,14 @@ '(24-hours ":" minutes (if time-zone " (") time-zone (if time-zone ")"))) -(setq diary-date-forms '((day "[-/]" month "[^-/0-9]") - (day " *" monthname "[ \t]*\\(\^M\\|\n\\)") - (backup day " *" monthname "\\W+\\<[^*0-9]") - (day "[-/]" month "[-/]" year "[^0-9]") - (day " *" monthname " *" year "[^0-9]") - (year "[-/]" month "[-/]" day "[^0-9]") - (dayname "\\W"))) +(setq diary-date-forms + '((day "[-/]" month "[^-/0-9]") + (day " *" monthname "[ \t]*\\(\^M\\|\n\\)") + (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|[0-9]+[:aApP]\\)") + (day "[-/]" month "[-/]" year "[^0-9]") + (day " *" monthname " *" year "[^0-9]") + (year "[-/]" month "[-/]" day "[^0-9]") + (dayname "\\W"))) ;; Fancy diary handling. -- [mdw]