ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2019-01-30 22:36:14 +01:00
parent 8ba23b9ce1 a6adc9831d
commit ee29cdc40e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org.el
View File

@ -672,7 +672,7 @@ on a string that terminates immediately after the date.")
The time stamps may be either active or inactive.") The time stamps may be either active or inactive.")
(defconst org-repeat-re (defconst org-repeat-re
"[[<][0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9] [^]>\n]*?\ "<[0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9] [^>\n]*?\
\\([.+]?\\+[0-9]+[hdwmy]\\(/[0-9]+[hdwmy]\\)?\\)" \\([.+]?\\+[0-9]+[hdwmy]\\(/[0-9]+[hdwmy]\\)?\\)"
"Regular expression for specifying repeated events. "Regular expression for specifying repeated events.
After a match, group 1 contains the repeat expression.") After a match, group 1 contains the repeat expression.")
@ -3005,6 +3005,11 @@ property to one or more of these keywords."
(const :tag "Force recording the DONE state" time) (const :tag "Force recording the DONE state" time)
(const :tag "Force recording a note with the DONE state" note))) (const :tag "Force recording a note with the DONE state" note)))
(defcustom org-todo-repeat-hook nil
"Hook that is run after a task has been repeated."
:package-version '(Org . "9.2")
:group 'org-todo
:type 'hook)
(defgroup org-priorities nil (defgroup org-priorities nil
"Priorities in Org mode." "Priorities in Org mode."
@ -12758,6 +12763,7 @@ enough to shift date past today. Continue? "
(org-timestamp-change n (cdr (assoc what whata)) nil t)) (org-timestamp-change n (cdr (assoc what whata)) nil t))
(setq msg (setq msg
(concat msg type " " org-last-changed-timestamp " "))))))) (concat msg type " " org-last-changed-timestamp " ")))))))
(run-hooks 'org-todo-repeat-hook)
(setq org-log-post-message msg) (setq org-log-post-message msg)
(message msg)))) (message msg))))

4
testing/lisp/test-org.el
View File

@ -6650,8 +6650,8 @@ Paragraph<point>"
(org-test-with-temp-text "* TODO H\n<2012-03-29 Thu +2h>" (org-test-with-temp-text "* TODO H\n<2012-03-29 Thu +2h>"
(org-todo "DONE") (org-todo "DONE")
(buffer-string)))) (buffer-string))))
;; Also repeat inactive time stamps with a repeater. ;; Do not repeat inactive time stamps with a repeater.
(should (should-not
(string-match-p (string-match-p
"\\[2014-03-29 .* \\+2y\\]" "\\[2014-03-29 .* \\+2y\\]"
(let ((org-todo-keywords '((sequence "TODO" "DONE")))) (let ((org-todo-keywords '((sequence "TODO" "DONE"))))