diff options
author | Bastien Guerry <bzg@altern.org> | 2013-01-26 15:11:21 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-01-26 15:11:21 +0100 |
commit | 5e11659e66845e918a047f4a89d171f599729174 (patch) | |
tree | 73df3ce9c6fc767b4d8b3bf2253f5f73e03170eb | |
parent | 714b3722784364f34dbb9a8b28039938806726aa (diff) | |
parent | a1196499237b6a0389fba2d21b69c34068404519 (diff) | |
download | org-mode-5e11659e66845e918a047f4a89d171f599729174.tar.gz |
Merge branch 'maint'
Conflicts:
lisp/org.el
-rw-r--r-- | lisp/org.el | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/lisp/org.el b/lisp/org.el index 21af0c1..a9285ee 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5135,9 +5135,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) @@ -5157,6 +5154,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) @@ -17078,16 +17076,11 @@ This requires Emacs >= 24.1, build with imagemagick support." (list :tag "Use #+ATTR* or a number of pixels" (integer)) (const :tag "Use #+ATTR* or don't resize" nil))) -(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) @@ -17431,8 +17424,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 |