From d0cad612ec9631f06a3e7bb763acb14accf7f083 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sat, 26 Jan 2013 15:03:21 +0100 Subject: [PATCH 1/2] 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. --- lisp/org.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 7467db7c3..1fdae2680 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) From a1196499237b6a0389fba2d21b69c34068404519 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sat, 26 Jan 2013 15:10:43 +0100 Subject: [PATCH 2/2] org.el (org-agenda-inhibit-startup): Rename from `org-agenda-inhibit-startup-visibility-cycling' * org.el (org-agenda-inhibit-startup): Rename from `org-agenda-inhibit-startup-visibility-cycling'. (org-agenda-prepare-buffers): Bind `org-inhibit-startup' to `org-agenda-inhibit-startup'. --- lisp/org.el | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 1fdae2680..dc000b8f1 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -16660,16 +16660,11 @@ effort string \"2hours\" is equivalent to 120 minutes." :type '(alist :key-type (string :tag "Modifier") :value-type (number :tag "Minutes"))) -(defcustom org-agenda-inhibit-startup-visibility-cycling t - "Turn off visibility cycling when preparing agenda buffers. - -When preparing agenda buffers, Org visits agenda files. When -this variable is `t' (the default), the visited buffers for -agenda files will not honor `org-startup-folded' or any -#+STARTUP: fold option. Turning this option off may slow down -the generation of agenda, both because folding takes time and -because finding entries in folded buffers takes longer than -finding entries in unfolded ones." +(defcustom org-agenda-inhibit-startup t + "Inhibit startup when preparing agenda buffers. +When this variable is `t' (the default), the initialization of +the Org agenda buffers is inhibited: e.g. the visibility state +is not set, the tables are not re-aligned, etc." :type 'boolean :version "24.3" :group 'org-agenda) @@ -17013,8 +17008,7 @@ When a buffer is unmodified, it is just killed. When modified, it is saved (pc '(:org-comment t)) (pall '(:org-archived t :org-comment t)) (inhibit-read-only t) - (org-inhibit-startup-visibility-stuff - org-agenda-inhibit-startup-visibility-cycling) + (org-inhibit-startup org-agenda-inhibit-startup) (rea (concat ":" org-archive-tag ":")) bmp file re) (save-excursion