tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2014-03-24 06:29:26 +01:00
parent cb91729595 c4bca1c384
commit bf27c6b71f
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/lisp/ox-rss.el
View file

@ -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

2
lisp/org-clock.el
View file

@ -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)))))