Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/lib

diff --git a/emacs_el/configuration/org-mode-configuration.el b/emacs_el/configuration/org-mode-configuration.el
index 854b8ffb86f6ba105730d07ca1aaa15d9286d1bb..bb3ff9c0ea26fef57ae014ca44bba30854b8d237 100644 (file)
--- a/emacs_el/configuration/org-mode-configuration.el
+++ b/emacs_el/configuration/org-mode-configuration.el
@@ -424,7 +424,9 @@ Maildir, or by Message-ID."
  'org-babel-load-languages
  '((emacs-lisp . t )
    (R . t)
-   (latex . t)))
+   (latex . t)
+   (ditaa . t)
+   ))
 ;; org-babel-by-backend
 (defmacro org-babel-by-backend (&rest body)
    `(case (if (boundp 'backend) 
@@ -466,6 +468,18 @@ Maildir, or by Message-ID."
                ("\\paragraph{%s}" . "\\paragraph*{%s}")
                ("\\subparagraph{%s}" . "\\subparagraph*{%s}")))
 
+(add-to-list 'org-latex-classes
+             '("beamer"
+               "\\documentclass[ignorenonframetext]{beamer}
+[NO-DEFAULT-PACKAGES]
+[PACKAGES]
+[EXTRA]"
+               ("\\section{%s}" . "\\section*{%s}")
+               ("\\subsection{%s}" . "\\subsection*{%s}")
+               ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
+               ("\\paragraph{%s}" . "\\paragraph*{%s}")
+               ("\\subparagraph{%s}" . "\\subparagraph*{%s}")))
+
 (add-to-list 'org-latex-classes
              '("membook"
                "\\documentclass[11pt,oneside]{memoir}\n"
@@ -527,6 +541,9 @@ Maildir, or by Message-ID."
       (setq ad-return-value contents)
     ad-do-it))
 
+;; keep latex logfiles
+
+(setq org-latex-remove-logfiles nil)
 
 ;; helper functions
 (defun bh/is-project-p ()