浏览代码

Merge branch 'maint'

Conflicts:
	lisp/ox-html.el
Nicolas Goaziou 12 年之前
父节点
当前提交
94c48111c9
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      contrib/lisp/ox-groff.el
  2. 1 1
      lisp/ox-man.el
  3. 1 1
      lisp/ox-texinfo.el

+ 1 - 1
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)

+ 1 - 1
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)

+ 1 - 1
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)