Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-12-27 23:57:37 +01:00
commit a88bd87787
1 changed files with 1 additions and 1 deletions

View File

@ -12097,7 +12097,7 @@ When called through ELisp, arg is also interpreted in the following way:
(or (looking-at (concat " +" org-todo-regexp "\\( +\\|[ \t]*$\\)")) (or (looking-at (concat " +" org-todo-regexp "\\( +\\|[ \t]*$\\)"))
(looking-at "\\(?: *\\|[ \t]*$\\)")) (looking-at "\\(?: *\\|[ \t]*$\\)"))
(let* ((match-data (match-data)) (let* ((match-data (match-data))
(startpos (point-at-bol)) (startpos (copy-marker (line-beginning-position)))
(logging (save-match-data (org-entry-get nil "LOGGING" t t))) (logging (save-match-data (org-entry-get nil "LOGGING" t t)))
(org-log-done org-log-done) (org-log-done org-log-done)
(org-log-repeat org-log-repeat) (org-log-repeat org-log-repeat)