diff options
author | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-05-08 18:20:08 +0200 |
---|---|---|
committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-05-08 18:20:08 +0200 |
commit | 800ea286c48692f2438550e7eecbc915c1999dc9 (patch) | |
tree | 5751a63e40c68a0c280480d070700c33b1099d7c | |
parent | 77368d13fa4f0fc1c1ef7dc0382a6042365eab29 (diff) | |
parent | 7e4c7edb8a077149c8da7ede0a4e42e7861a32d9 (diff) | |
download | org-mode-800ea286c48692f2438550e7eecbc915c1999dc9.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/ox.el | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -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]+\\)?\\)\"" |