ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-01-04 12:23:27 +01:00
parent 7e1ea27e78 44acd00049
commit 02078833e0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org.el
View File

@ -6894,10 +6894,12 @@ With a numeric prefix, show all headlines up to that level."
"Set the visibility required by startup options and properties."
(cond
((eq org-startup-folded t)
(org-cycle '(4)))
(org-overview))
((eq org-startup-folded 'content)
(let ((this-command 'org-cycle) (last-command 'org-cycle))
(org-cycle '(4)) (org-cycle '(4)))))
(org-content))
((or (eq org-startup-folded 'showeverything)
(eq org-startup-folded nil))
(show-all)))
(unless (eq org-startup-folded 'showeverything)
(if org-hide-block-startup (org-hide-block-all))
(org-set-visibility-according-to-property 'no-cleanup)
@ -6977,7 +6979,6 @@ With numerical argument N, show content up to level N."
(show-branches))
(if (bobp) (throw 'exit nil))))))
(defun org-optimize-window-after-visibility-change (state)
"Adjust the window after a change in outline visibility.
This function is the default value of the hook `org-cycle-hook'."