diff options
| author | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-05-30 21:51:00 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-05-30 21:51:00 +0200 |
| commit | 94c48111c9e1543bafb012c2342847e343d82d4a (patch) | |
| tree | 711e628941fcc3d87ef0462f0d63f5a9053a5211 | |
| parent | d574bf522d1b2ac74cb4245f8742253bde7861df (diff) | |
| parent | 0f2ba793aace3fade6db121d34d6d548023f64d9 (diff) | |
| download | org-mode-94c48111c9e1543bafb012c2342847e343d82d4a.tar.gz | |
Merge branch 'maint'
Conflicts:
lisp/ox-html.el
| -rw-r--r-- | contrib/lisp/ox-groff.el | 2 | ||||
| -rw-r--r-- | lisp/ox-man.el | 2 | ||||
| -rw-r--r-- | lisp/ox-texinfo.el | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/lisp/ox-groff.el b/contrib/lisp/ox-groff.el index 6ffba98..ef54700 100644 --- a/contrib/lisp/ox-groff.el +++ b/contrib/lisp/ox-groff.el @@ -1920,7 +1920,7 @@ Return PDF file name or an error if it couldn't be produced." (full-name (file-truename file)) (out-dir (file-name-directory file)) ;; Properly set working directory for compilation. - (default-directory (if (file-name-absolute-p texfile) + (default-directory (if (file-name-absolute-p file) (file-name-directory full-name) default-directory)) errors) diff --git a/lisp/ox-man.el b/lisp/ox-man.el index 41410cf..b99a464 100644 --- a/lisp/ox-man.el +++ b/lisp/ox-man.el @@ -1205,7 +1205,7 @@ Return PDF file name or an error if it couldn't be produced." (full-name (file-truename file)) (out-dir (file-name-directory file)) ;; Properly set working directory for compilation. - (default-directory (if (file-name-absolute-p texfile) + (default-directory (if (file-name-absolute-p file) (file-name-directory full-name) default-directory)) errors) diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el index 2491eea..289ee46 100644 --- a/lisp/ox-texinfo.el +++ b/lisp/ox-texinfo.el @@ -1802,7 +1802,7 @@ Return INFO file name or an error if it couldn't be produced." (full-name (file-truename file)) (out-dir (file-name-directory file)) ;; Properly set working directory for compilation. - (default-directory (if (file-name-absolute-p texfile) + (default-directory (if (file-name-absolute-p file) (file-name-directory full-name) default-directory)) errors) |