Sfoglia il codice sorgente

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 <mdl@imapmail.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/102021>
Nicolas Goaziou 9 anni fa
parent
commit
ebe2d83eea
2 ha cambiato i file con 5 aggiunte e 8 eliminazioni
  1. 0 3
      etc/ORG-NEWS
  2. 5 5
      lisp/org.el

+ 0 - 3
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.

+ 5 - 5
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)))