branch: externals/org
commit ca061cfacb60a22f7aaa824bc061797493395109
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>

    org-beamer-template: Fix when `org-beamer-frame-environement' is "frame"
    
    * lisp/ox-beamer.el (org-beamer-template): Do not try to define
    `org-beamer-frame-environement' when it is set to "frame" - the same
    as the existing frame environment.
    
    Reported-by: Pedro Andres Aranda Gutierrez <paag...@gmail.com>
    Link: https://orgmode.org/list/87a5nh1r9h....@t14.reltub.ca
---
 lisp/ox-beamer.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el
index 56e7e06ed0..4fad37b59f 100644
--- a/lisp/ox-beamer.el
+++ b/lisp/ox-beamer.el
@@ -852,8 +852,9 @@ holding export options."
      ;; Document class and packages.
      (org-latex-make-preamble info)
      ;; Define the alternative frame environment.
-     (format 
"\\newenvironment<>{%s}[1][]{\\begin{frame}#2[environment=%1$s,#1]}{\\end{frame}}\n"
-             org-beamer-frame-environment)
+     (unless (equal "frame" org-beamer-frame-environment)
+       (format 
"\\newenvironment<>{%s}[1][]{\\begin{frame}#2[environment=%1$s,#1]}{\\end{frame}}\n"
+               org-beamer-frame-environment))
      ;; Insert themes.
      (let ((format-theme
            (lambda (prop command)

Reply via email to