From 3c6c53d426085ed75f62099f00082d901e48cc4f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 18 Oct 2016 23:56:16 +0200 Subject: [PATCH] org-agenda: Fix regression with `org-agenda-skip-scheduled-if-deadline-is-shown' * lisp/org-agenda.el (org-agenda-get-scheduled): Fix code typo. Tiny refactoring. The typo was introduced in 72c3f5e8e55ccab8a9793f729bfbaa89f4fab732. Reported-by: Luke --- 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 2bc6ef7d4..4559f9013 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6239,7 +6239,7 @@ scheduled items with an hour specification like [h]h:mm." (cond ;; Nullify delay when a repeater triggered already ;; and the delay is of the form --Xd. - ((and (save-match-data (string-match "--[0-9]+[hdwmy]" s)) + ((and (string-match-p "--[0-9]+[hdwmy]" s) (/= schedule last-repeat)) 0) (suppress-delay @@ -6270,7 +6270,7 @@ scheduled items with an hour specification like [h]h:mm." ;; doesn't apply to habits. (when (pcase org-agenda-skip-scheduled-if-deadline-is-shown ((guard - (or (not (assq (line-beginning-position 0) deadline-pos)) + (or (not (memq (line-beginning-position 0) deadline-pos)) habitp)) nil) (`repeated-after-deadline