diff options
author | Bastien Guerry <bzg@altern.org> | 2013-01-26 15:03:21 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-01-26 15:03:21 +0100 |
commit | d0cad612ec9631f06a3e7bb763acb14accf7f083 (patch) | |
tree | 4d11ebb08a1358e113bb1711d1ed536246aef837 | |
parent | b425e2a2d6277d59749dcd7ce04336092eeaaeae (diff) | |
download | org-mode-d0cad612ec9631f06a3e7bb763acb14accf7f083.tar.gz |
org.el (org-mode): Don't initialize `org-beamer-mode' when `org-inhibit-startup' is non-nil
* org.el (org-mode): Don't initialize `org-beamer-mode' when
`org-inhibit-startup' is non-nil.
-rw-r--r-- | lisp/org.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el index 7467db7..1fdae26 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4970,9 +4970,6 @@ The following commands are available: (org-set-local 'outline-isearch-open-invisible-function (lambda (&rest ignore) (org-show-context 'isearch)))) - ;; Turn on org-beamer-mode? - (and org-startup-with-beamer-mode (org-beamer-mode)) - ;; Setup the pcomplete hooks (set (make-local-variable 'pcomplete-command-completion-function) 'org-pcomplete-initial) @@ -4992,6 +4989,7 @@ The following commands are available: (= (point-min) (point-max))) (insert "# -*- mode: org -*-\n\n")) (unless org-inhibit-startup + (and org-startup-with-beamer-mode (org-beamer-mode)) (when org-startup-align-all-tables (let ((bmp (buffer-modified-p))) (org-table-map-tables 'org-table-align 'quietly) |