ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2011-10-28 11:18:21 +02:00
parent 901121ac45 ca49e893ab
commit 735bf5cd05
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-docbook.el
View File

@ -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

1
lisp/org-html.el
View File

@ -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*"))

2
lisp/org-latex.el
View File

@ -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