summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2013-05-08 16:13:06 (GMT)
committer Nicolas Goaziou <n.goaziou@gmail.com>2013-05-08 16:13:06 (GMT)
commit7e4c7edb8a077149c8da7ede0a4e42e7861a32d9 (patch)
treec861111f0199f96bf08349278e41064379e64f57
parent16f12e0aef9fab4bdc575ebee8c463846377ef8b (diff)
downloadorg-mode-7e4c7edb8a077149c8da7ede0a4e42e7861a32d9.zip
org-mode-7e4c7edb8a077149c8da7ede0a4e42e7861a32d9.tar.gz
ox: Small refactoring
* lisp/ox.el (org-export-expand-include-keyword): Avoid using `read' to determine file name.
-rw-r--r--lisp/ox.el16
1 files changed, 7 insertions, 9 deletions
diff --git a/lisp/ox.el b/lisp/ox.el
index f28d969..7a2186f 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -3267,15 +3267,13 @@ paths."
;; Extract arguments from keyword's value.
(let* ((value (org-element-property :value element))
(ind (org-get-indentation))
- (file (let ((f (if (eq (aref value 0) ?\") (read value)
- (and (string-match "^\\S-+" value)
- (match-string 0 value)))))
- (setq value
- (progn
- (string-match (format "^\"?%s\"?[ \t]*" f)
- value)
- (replace-match "" nil nil value)))
- (expand-file-name f dir)))
+ (file (and (string-match
+ "^\\(\".+?\"\\|\\S-+\\)\\(?:\\s-+\\|$\\)" value)
+ (prog1 (expand-file-name
+ (org-remove-double-quotes
+ (match-string 1 value))
+ dir)
+ (setq value (replace-match "" nil nil value)))))
(lines
(and (string-match
":lines +\"\\(\\(?:[0-9]+\\)?-\\(?:[0-9]+\\)?\\)\""