From 2836c9cd81cfaae9b47b45be890ea4d9e72882c5 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 24 Mar 2014 06:27:31 +0100 Subject: [PATCH 1/2] org-rss-headline: Replace bracket links by their descriptions * contrib/lisp/ox-rss.el (org-rss-headline): Replace bracket links by their descriptions. Thanks to steckerhalter for reporting this. --- contrib/lisp/ox-rss.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el index 4bdd1be37..5fd2afc68 100644 --- a/contrib/lisp/ox-rss.el +++ b/contrib/lisp/ox-rss.el @@ -240,7 +240,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 @@ -319,8 +323,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%s From c4bca1c38496e34e43528fb33f53200637517e00 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 24 Mar 2014 06:29:14 +0100 Subject: [PATCH 2/2] Fix 3a233aa --- lisp/org-clock.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index a777891d5..b6829dad7 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1838,9 +1838,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) @@ -2707,11 +2707,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))