mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

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>
This commit is contained in:
Nicolas Goaziou 2015-10-25 16:48:50 +01:00
parent 842c5f7cb7
commit ebe2d83eea
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/ORG-NEWS
View File

@ -9,9 +9,6 @@ See the end of the file for license conditions.
Please send Org bug reports to mailto:emacs-orgmode@gnu.org. Please send Org bug reports to mailto:emacs-orgmode@gnu.org.
* Version 8.4 * Version 8.4
** Incompatible changes
*** ~org-agenda-repeating-timestamp-show-all~ is more selective
The variable only applies to ~+~ repeaters, not ~.+~ nor ~++~.
** New features ** New features
*** Org linter *** Org linter
~org-lint~ can check syntax and report common issues in Org documents. ~org-lint~ can check syntax and report common issues in Org documents.

10
lisp/org.el
View File

@ -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 past. When PREFER is `future', return a date that is either
CURRENT or future. CURRENT or future.
Only time stamps with a simple repeater (i.e., neither \"++\" nor Only time stamps with a repeater are modified. Any other time
\".+\") are modified. Any other time stamp stay unchanged. In stamp stay unchanged. In any case, return value is an absolute
any case, return value is an absolute day number." day number."
(if (not (string-match "[^.+]\\+\\([0-9]+\\)\\([hdwmy]\\)" start)) (if (not (string-match "\\+\\([0-9]+\\)\\([hdwmy]\\)" start))
;; No valid repeater. Do not shift time stamp. ;; No repeater. Do not shift time stamp.
(time-to-days (apply #'encode-time (org-parse-time-string start))) (time-to-days (apply #'encode-time (org-parse-time-string start)))
(let ((value (string-to-number (match-string 1 start))) (let ((value (string-to-number (match-string 1 start)))
(type (match-string 2 start))) (type (match-string 2 start)))