forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
bf27c6b71f
|
@ -246,7 +246,11 @@ communication channel."
|
||||||
(org-time-string-to-time
|
(org-time-string-to-time
|
||||||
(or (org-element-property :PUBDATE headline)
|
(or (org-element-property :PUBDATE headline)
|
||||||
(error "Missing PUBDATE property"))))))
|
(error "Missing PUBDATE property"))))))
|
||||||
(title (org-element-property :raw-value headline))
|
(title (replace-regexp-in-string
|
||||||
|
org-bracket-link-regexp
|
||||||
|
(lambda (m) (or (match-string 3 m)
|
||||||
|
(match-string 1 m)))
|
||||||
|
(org-element-property :raw-value headline)))
|
||||||
(publink
|
(publink
|
||||||
(or (and hl-perm (concat (or hl-home hl-pdir) hl-perm))
|
(or (and hl-perm (concat (or hl-home hl-pdir) hl-perm))
|
||||||
(concat
|
(concat
|
||||||
|
|
|
@ -2712,7 +2712,7 @@ TIME: The sum of all time spend in this tree, in minutes. This time
|
||||||
(match-string 2)))
|
(match-string 2)))
|
||||||
(org-make-org-heading-search-string
|
(org-make-org-heading-search-string
|
||||||
(replace-regexp-in-string
|
(replace-regexp-in-string
|
||||||
org-bracket-link-analytic-regexp
|
org-bracket-link-regexp
|
||||||
(lambda (m) (or (match-string 3 m)
|
(lambda (m) (or (match-string 3 m)
|
||||||
(match-string 1 m)))
|
(match-string 1 m)))
|
||||||
(match-string 2)))))
|
(match-string 2)))))
|
||||||
|
|
Loading…
Reference in a new issue