diff options
author | Bastien Guerry <bzg@altern.org> | 2011-10-28 11:18:21 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2011-10-28 11:18:21 +0200 |
commit | 735bf5cd05c970d08aaecf800973f59a39dea7fb (patch) | |
tree | 34ea8536c000633e12d721dd7f1d6b21411e65cb | |
parent | 901121ac4597e18ab19087fdb210b6a7a6951b85 (diff) | |
parent | ca49e893ab03e8f6c8a494be6d830bd77d815ad6 (diff) | |
download | org-mode-735bf5cd05c970d08aaecf800973f59a39dea7fb.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | lisp/org-docbook.el | 4 | ||||
-rw-r--r-- | lisp/org-html.el | 1 | ||||
-rw-r--r-- | lisp/org-latex.el | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/lisp/org-docbook.el b/lisp/org-docbook.el index e2ffe34..e70df25 100644 --- a/lisp/org-docbook.el +++ b/lisp/org-docbook.el @@ -474,9 +474,11 @@ publishing directory." (current-dir (if buffer-file-name (file-name-directory buffer-file-name) default-directory)) + (auto-insert nil); Avoid any auto-insert stuff for the new file (buffer (if to-buffer (cond - ((eq to-buffer 'string) (get-buffer-create "*Org DocBook Export*")) + ((eq to-buffer 'string) + (get-buffer-create "*Org DocBook Export*")) (t (get-buffer-create to-buffer))) (find-file-noselect filename))) ;; org-levels-open is a global variable diff --git a/lisp/org-html.el b/lisp/org-html.el index e7eada2..30d7c90 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1147,6 +1147,7 @@ PUB-DIR is set, use this as the publishing directory." (current-dir (if buffer-file-name (file-name-directory buffer-file-name) default-directory)) + (auto-insert nil); Avoid any auto-insert stuff for the new file (buffer (if to-buffer (cond ((eq to-buffer 'string) (get-buffer-create "*Org HTML Export*")) diff --git a/lisp/org-latex.el b/lisp/org-latex.el index 325e76b..649e4a7 100644 --- a/lisp/org-latex.el +++ b/lisp/org-latex.el @@ -869,6 +869,8 @@ when PUB-DIR is set, use this as the publishing directory." (file-truename (or buffer-file-name "dummy.org"))) (concat filename ".tex") filename))) + (auto-insert nil); Avoid any auto-insert stuff for the new file + (TeX-master t) ; Avoid the Query for TeX master from AUCTeX (buffer (if to-buffer (cond ((eq to-buffer 'string) (get-buffer-create |