summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-01 16:35:50 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-01 16:35:50 (GMT)
commit55e1489d9821412e6a299c1da58ff4f6392eed9d (patch)
treeb293d6e6e6b1eef9d9cf1ae0f0f791a3f664bc7c
parentb6615d01793d690e60cae3c487db295e6c2843ac (diff)
parent0f2bb6a56f4ff36cab13d0c6dd888a5b1691dc76 (diff)
downloadorg-mode-55e1489d9821412e6a299c1da58ff4f6392eed9d.zip
org-mode-55e1489d9821412e6a299c1da58ff4f6392eed9d.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-exp.el2
-rw-r--r--lisp/org-latex.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 766325f..1e43ed8 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -3053,7 +3053,7 @@ to the value of `temporary-file-directory'."
(eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode'
(list 'let org-local-vars
(list (intern (format "org-export-as-%s" fmt))
- nil nil nil ''string t dir))))
+ nil nil ''string t dir))))
(delete-file tmp-file))))
;;;###autoload
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 72236c7..55866e8 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -872,7 +872,7 @@ no LaTeX header.
When BODY-ONLY is set, don't produce the file header and footer,
simply return the content of \\begin{document}...\\end{document},
without even the \\begin{document} and \\end{document} commands.
-when PUB-DIR is set, use this as the publishing directory."
+When PUB-DIR is set, use this as the publishing directory."
(interactive "P")
(when (and (not body-only) arg (listp arg)) (setq body-only t))
(run-hooks 'org-export-first-hook)