diff options
| author | Bastien Guerry <bzg@altern.org> | 2014-03-24 06:29:26 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2014-03-24 06:29:26 +0100 |
| commit | bf27c6b71f8b3d94046e80800bd2e4b32f117e2e (patch) | |
| tree | 03576aa90da2aab945574d0124fa1749fb1eacbb | |
| parent | cb91729595f896cc7fd9499e2250661c5dd2f49f (diff) | |
| parent | c4bca1c38496e34e43528fb33f53200637517e00 (diff) | |
| download | org-mode-bf27c6b71f8b3d94046e80800bd2e4b32f117e2e.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | contrib/lisp/ox-rss.el | 10 | ||||
| -rw-r--r-- | lisp/org-clock.el | 16 |
2 files changed, 15 insertions, 11 deletions
diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el index 406c142..c69a37b 100644 --- a/contrib/lisp/ox-rss.el +++ b/contrib/lisp/ox-rss.el @@ -246,7 +246,11 @@ communication channel." (org-time-string-to-time (or (org-element-property :PUBDATE headline) (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 (or (and hl-perm (concat (or hl-home hl-pdir) hl-perm)) (concat @@ -326,8 +330,8 @@ as a communication channel." (ifile (plist-get info :input-file)) (publink (concat (file-name-as-directory blogurl) - (file-name-nondirectory - (file-name-sans-extension ifile)) + (file-name-nondirectory + (file-name-sans-extension ifile)) "." rssext))) (format "\n<title>%s</title> diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 7138048..d47bf59 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1842,9 +1842,9 @@ Use \\[org-clock-remove-overlays] to remove the subtree times." (when org-remove-highlights-with-change (org-add-hook 'before-change-functions 'org-clock-remove-overlays nil 'local)))) - (message (concat "Total file time: " - (org-minutes-to-clocksum-string org-clock-file-total-minutes) - " (%d hours and %d minutes)") h m))) + (message (concat "Total file time: " + (org-minutes-to-clocksum-string org-clock-file-total-minutes) + " (%d hours and %d minutes)") h m))) (defvar org-clock-overlays nil) (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 (match-string 2))) (org-make-org-heading-search-string - (replace-regexp-in-string - org-bracket-link-analytic-regexp - (lambda (m) (or (match-string 3 m) - (match-string 1 m))) - (match-string 2))))) + (replace-regexp-in-string + org-bracket-link-regexp + (lambda (m) (or (match-string 3 m) + (match-string 1 m))) + (match-string 2))))) tsp (when timestamp (setq props (org-entry-properties (point))) (or (cdr (assoc "SCHEDULED" props)) |