From 9751dc4561b2ed3cb410bb8f8949d099b333a7aa Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Oct 2012 20:58:27 +0200 Subject: [PATCH] org-export: Use relative path for target filenames * contrib/lisp/org-export.el (org-export-output-file-name): Use relative path for target filenames. --- contrib/lisp/org-export.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el index b331225d3..b40f18843 100644 --- a/contrib/lisp/org-export.el +++ b/contrib/lisp/org-export.el @@ -2675,7 +2675,7 @@ determined." "EXPORT_FILE_NAME" t)) ;; File name may be extracted from buffer's associated ;; file, if any. - (buffer-file-name (buffer-base-buffer)) + (file-name-nondirectory (buffer-file-name (buffer-base-buffer))) ;; Can't determine file name on our own: Ask user. (let ((read-file-name-function (and org-completion-use-ido 'ido-read-file-name))) @@ -2683,17 +2683,16 @@ determined." "Output file: " pub-dir nil nil nil (lambda (name) (string= (file-name-extension name t) extension)))))))) - ;; Build file name. Enforce EXTENSION over whatever user may have - ;; come up with. PUB-DIR, if defined, always has precedence over + ;; Build file name. Enforce EXTENSION over whatever user may have + ;; come up with. PUB-DIR, if defined, always has precedence over ;; any provided path. (cond (pub-dir (concat (file-name-as-directory pub-dir) (file-name-nondirectory base-name) extension)) - ((string= (file-name-nondirectory base-name) base-name) - (concat (file-name-as-directory ".") base-name extension)) - (t (concat base-name extension))))) + ((file-name-absolute-p base-name) (concat base-name extension)) + (t (concat (file-name-as-directory ".") base-name extension))))) (defmacro org-export-with-current-buffer-copy (&rest body) "Apply BODY in a copy of the current buffer. -- 2.11.4.GIT