tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

ox: Small refactoring 

* lisp/ox.el (org-export-expand-include-keyword): Avoid using `read'
  to determine file name.
This commit is contained in:
Nicolas Goaziou 2013-05-08 18:13:06 +02:00
parent 16f12e0aef
commit 7e4c7edb8a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lisp/ox.el
View File

@ -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]+\\)?\\)\""