From ebe2d83eea5a197899050bec5dc43b000d0e41b7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 25 Oct 2015 16:48:50 +0100 Subject: [PATCH] Partly revert "Change `org-agenda-repeating-timestamp-show-all' targets" * lisp/org.el (org-closest-date): Handle every type of repeater. Reported-by: Matt Lundin --- etc/ORG-NEWS | 3 --- lisp/org.el | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 09935005b..624654ae4 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -9,9 +9,6 @@ See the end of the file for license conditions. Please send Org bug reports to mailto:emacs-orgmode@gnu.org. * Version 8.4 -** Incompatible changes -*** ~org-agenda-repeating-timestamp-show-all~ is more selective -The variable only applies to ~+~ repeaters, not ~.+~ nor ~++~. ** New features *** Org linter ~org-lint~ can check syntax and report common issues in Org documents. diff --git a/lisp/org.el b/lisp/org.el index 088913ca9..00f29b8ea 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -17769,11 +17769,11 @@ When PREFER is `past', return a date that is either CURRENT or past. When PREFER is `future', return a date that is either CURRENT or future. -Only time stamps with a simple repeater (i.e., neither \"++\" nor -\".+\") are modified. Any other time stamp stay unchanged. In -any case, return value is an absolute day number." - (if (not (string-match "[^.+]\\+\\([0-9]+\\)\\([hdwmy]\\)" start)) - ;; No valid repeater. Do not shift time stamp. +Only time stamps with a repeater are modified. Any other time +stamp stay unchanged. In any case, return value is an absolute +day number." + (if (not (string-match "\\+\\([0-9]+\\)\\([hdwmy]\\)" start)) + ;; No repeater. Do not shift time stamp. (time-to-days (apply #'encode-time (org-parse-time-string start))) (let ((value (string-to-number (match-string 1 start))) (type (match-string 2 start)))