emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals-release/org c093565: agenda: Fix `org-get-time-of-day'


From: ELPA Syncer
Subject: [elpa] externals-release/org c093565: agenda: Fix `org-get-time-of-day' on empty string
Date: Sun, 20 Jun 2021 12:57:13 -0400 (EDT)

branch: externals-release/org
commit c09356548f9fa01f38bf6b1e7606ffda89e33e74
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    agenda: Fix `org-get-time-of-day' on empty string
    
    * lisp/org-agenda.el (org-get-time-of-day): Ensure S is not empty
    before calling `get-text-property'.
    
    This regression was introduced in aba1f2066.
    
    Reported-by: Ihor Radchenko <yantar92@gmail.com>
    <http://lists.gnu.org/r/emacs-orgmode/2021-06/msg00385.html>
    
    Reported-by: Ihor Radchenko <yantar92@gmail.com>
    <http://lists.gnu.org/r/emacs-orgmode/2021-06/msg00385.html>
---
 lisp/org-agenda.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 0ad4105..c3fbabc 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6914,8 +6914,8 @@ where H:MM is the duration above midnight."
                  (group-n 3 (or "am" "pm")))
              word-end)))
     (save-match-data
-      (when (and (not (eq 'org-link (get-text-property 1 'face s)))
-                 (string-match time-regexp s))
+      (when (and (string-match time-regexp s)
+                 (not (eq 'org-link (get-text-property 1 'face s))))
         (let ((hours
                (let* ((ampm (and (match-end 3) (downcase (match-string 3 s))))
                       (am-p (equal ampm "am")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]