Fix bug in the menu and a small change to org-beamer.

* org.el: Prevent a bug while defining the menu by requiring
`org-beamer' when necessary.

* org-beamer.el (org-insert-beamer-options-template): Make the
parameter optional since the interactive call defines it.
This commit is contained in:
Bastien Guerry 2012-03-28 01:04:36 +02:00
parent 8d74c84962
commit 165cb4610a
2 changed files with 3 additions and 2 deletions

View file

@ -579,7 +579,7 @@ include square brackets."
(add-hook 'org-export-preprocess-before-selecting-backend-code-hook
'org-beamer-select-beamer-code)
(defun org-insert-beamer-options-template (kind)
(defun org-insert-beamer-options-template (&optional kind)
"Insert a settings template, to make sure users do this right."
(interactive (progn
(message "Current [s]ubtree or [g]lobal?")

View file

@ -19082,7 +19082,8 @@ See the individual commands for more information."
(org-inside-LaTeX-fragment-p)]
["Insert citation" org-reftex-citation t]
"--"
["Template for BEAMER" org-insert-beamer-options-template t])
["Template for BEAMER" (progn (require 'org-beamer)
(org-insert-beamer-options-template) t])
"--"
("MobileOrg"
["Push Files and Views" org-mobile-push t]