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

10
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
@ -326,8 +330,8 @@ as a communication channel."
(ifile (plist-get info :input-file)) (ifile (plist-get info :input-file))
(publink (publink
(concat (file-name-as-directory blogurl) (concat (file-name-as-directory blogurl)
(file-name-nondirectory (file-name-nondirectory
(file-name-sans-extension ifile)) (file-name-sans-extension ifile))
"." rssext))) "." rssext)))
(format (format
"\n<title>%s</title> "\n<title>%s</title>

16
lisp/org-clock.el
View file

@ -1842,9 +1842,9 @@ Use \\[org-clock-remove-overlays] to remove the subtree times."
(when org-remove-highlights-with-change (when org-remove-highlights-with-change
(org-add-hook 'before-change-functions 'org-clock-remove-overlays (org-add-hook 'before-change-functions 'org-clock-remove-overlays
nil 'local)))) nil 'local))))
(message (concat "Total file time: " (message (concat "Total file time: "
(org-minutes-to-clocksum-string org-clock-file-total-minutes) (org-minutes-to-clocksum-string org-clock-file-total-minutes)
" (%d hours and %d minutes)") h m))) " (%d hours and %d minutes)") h m)))
(defvar org-clock-overlays nil) (defvar org-clock-overlays nil)
(make-variable-buffer-local 'org-clock-overlays) (make-variable-buffer-local 'org-clock-overlays)
@ -2711,11 +2711,11 @@ TIME: The sum of all time spend in this tree, in minutes. This time
(save-match-data (save-match-data
(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)))))
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))