summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2014-04-03 20:51:54 (GMT)
committer Nicolas Goaziou <n.goaziou@gmail.com>2014-04-03 20:51:54 (GMT)
commit957177cebc7e6177c96b318c82580f9aef08334b (patch)
tree7e581d2152bbb8001234f4a0b7879db391ff828b
parent23e62f7527e7106abd12f35fc919f44dfe22f097 (diff)
parenta6485af3e4c6e1942fa6c19d3629fc4fb165693a (diff)
downloadorg-mode-957177cebc7e6177c96b318c82580f9aef08334b.zip
org-mode-957177cebc7e6177c96b318c82580f9aef08334b.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-ascii.el9
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el
index 3207acf..69591e7 100644
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@@ -751,7 +751,6 @@ generation. INFO is a plist used as a communication channel."
(defun org-ascii--unique-links (element info)
"Return a list of unique link references in ELEMENT.
-
ELEMENT is either a headline element or a section element. INFO
is a plist used as a communication channel."
(let* (seen
@@ -761,8 +760,14 @@ is a plist used as a communication channel."
;; Update SEEN links along the way.
(lambda (link)
(let ((footprint
+ ;; Normalize description in footprints.
(cons (org-element-property :raw-link link)
- (org-element-contents link))))
+ (let ((contents (org-element-contents link)))
+ (and contents
+ (replace-regexp-in-string
+ "[ \r\t\n]+" " "
+ (org-trim
+ (org-element-interpret-data contents))))))))
;; Ignore LINK if it hasn't been translated already.
;; It can happen if it is located in an affiliated
;; keyword that was ignored.