1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-11 09:20:32 +00:00

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-03-19 10:49:01 +01:00
commit 719b6ec77d

View File

@ -2709,9 +2709,12 @@ TIME: The sum of all time spend in this tree, in minutes. This time
(format "file:%s::%s" (format "file:%s::%s"
(buffer-file-name) (buffer-file-name)
(save-match-data (save-match-data
(org-make-org-heading-search-string (match-string 2)))
(match-string 2)))) (org-make-org-heading-search-string
(match-string 2))) (replace-regexp-in-string
org-bracket-link-regexp
"\\3"
(match-string 2)))))
tsp (when timestamp tsp (when timestamp
(setq props (org-entry-properties (point))) (setq props (org-entry-properties (point)))
(or (cdr (assoc "SCHEDULED" props)) (or (cdr (assoc "SCHEDULED" props))