diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-03-26 23:27:07 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-03-26 23:27:07 +0200 |
| commit | 30b7fba2ae380cbf8c2a634ecbd59e134a71fe05 (patch) | |
| tree | c5b60716cfe77b9300dc4d289a05dbf4aea275a9 | |
| parent | be8f76cbe983adfdb1b35ca8a824b32926dc78ed (diff) | |
| parent | 1b3cc4e4631a07c41632040439b73c1938714308 (diff) | |
| download | org-mode-30b7fba2ae380cbf8c2a634ecbd59e134a71fe05.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-agenda.el | 2 | ||||
| -rw-r--r-- | lisp/org.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index a8f3deb..649f5e2 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6192,7 +6192,7 @@ scheduled items with an hour specification like [h]h:mm." ;; Nullify delay when a repeater triggered already ;; and the delay is of the form --Xd. ((and (string-match-p "--[0-9]+[hdwmy]" s) - (> current schedule)) + (> schedule (org-agenda--timestamp-to-absolute s))) 0) (suppress-delay (let ((org-scheduled-delay-days suppress-delay)) diff --git a/lisp/org.el b/lisp/org.el index f5da6ee..cc8a902 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -7,7 +7,7 @@ ;; Maintainer: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: https://orgmode.org -;; Version: 9.1.8 +;; Version: 9.1.9 ;; ;; This file is part of GNU Emacs. ;; |