Merge branch 'maint'

2014-08-25 15:34:14 +02:00 · 2014-08-25 15:34:14 +02:00 · 6987059a20
parent c33afd5683 409913b253
commit 6987059a20
1 changed files with 2 additions and 1 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -6820,7 +6820,8 @@ in special contexts.
      (setq org-cycle-global-status 'overview)
      (run-hook-with-args 'org-cycle-hook 'overview)))))

-(defvar org-called-with-limited-levels);Dyn-bound in ̀org-with-limited-levels'.
+(defvar org-called-with-limited-levels nil
+  "Non-nil when `org-with-limited-levels' is currently active.")

 (defun org-cycle-internal-local ()
  "Do the local cycling action."