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

This commit is contained in:
Carsten Dominik 2013-02-28 09:36:22 +01:00
commit 9dba62be72
2 changed files with 7 additions and 4 deletions

View File

@ -18832,8 +18832,7 @@ If not, return to the original position and throw an error."
"Hook for activating single-letter speed commands.
`org-speed-commands-default' specifies a minimal command set.
Use `org-speed-commands-user' for further customization."
(when (or (and (bolp) (looking-at org-outline-regexp)
(not (org-in-block-p '("src"))))
(when (or (and (bolp) (looking-at org-outline-regexp))
(and (functionp org-use-speed-commands)
(funcall org-use-speed-commands)))
(cdr (assoc keys (append org-speed-commands-user

View File

@ -875,13 +875,17 @@ file name as its single argument."
(defcustom org-latex-logfiles-extensions
'("aux" "idx" "log" "out" "toc" "nav" "snm" "vrb")
"The list of file extensions to consider as LaTeX logfiles."
"The list of file extensions to consider as LaTeX logfiles.
The logfiles will be remove if `org-latex-remove-logfiles' is
non-nil."
:group 'org-export-latex
:type '(repeat (string :tag "Extension")))
(defcustom org-latex-remove-logfiles t
"Non-nil means remove the logfiles produced by PDF production.
These are the .aux, .log, .out, and .toc files."
By default, logfiles are files with these extensions: .aux, .idx,
.log, .out, .toc, .nav, .snm and .vrb. To define the set of
logfiles to remove, set `org-latex-logfiles-extensions'."
:group 'org-export-latex
:type 'boolean)