Merge branch '5-org-todo-loop'

This commit is contained in:
Bastien Guerry 2011-12-31 09:30:13 +01:00
commit d1b5b65c47
1 changed files with 192 additions and 185 deletions

View File

@ -11191,6 +11191,13 @@ For calling through lisp, arg is also interpreted in the following way:
\"WAITING\" -> switch to the specified keyword, but only if it
really is a member of `org-todo-keywords'."
(interactive "P")
(if (and (org-region-active-p) org-loop-over-headlines-in-active-region)
(let (org-loop-over-headlines-in-active-region)
(org-map-entries
`(org-todo ,arg)
org-loop-over-headlines-in-active-region
'region
(if (outline-invisible-p) (org-end-of-subtree nil t))))
(if (equal arg '(16)) (setq arg 'nextset))
(let ((org-blocker-hook org-blocker-hook)
(case-fold-search nil))
@ -11378,7 +11385,7 @@ For calling through lisp, arg is also interpreted in the following way:
(and (looking-at " ") (just-one-space))))
(when org-trigger-hook
(save-excursion
(run-hook-with-args 'org-trigger-hook change-plist))))))))
(run-hook-with-args 'org-trigger-hook change-plist)))))))))
(defun org-block-todo-from-children-or-siblings-or-parent (change-plist)
"Block turning an entry into a TODO, using the hierarchy.