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

org.el (org-todo): Ignore the comment string when changing a TODO state 

* org.el (org-todo): Ignore the comment string when changing
the TODO state of a headline.

Thanks to Samuel Wales for reporting this.
This commit is contained in:
Bastien Guerry 2012-12-22 20:16:17 +01:00
parent ce4e0846b2
commit f015ae5b8b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org.el
View File

@ -11439,7 +11439,8 @@ For calling through lisp, arg is also interpreted in the following way:
cl (if (outline-invisible-p) (org-end-of-subtree nil t)))) cl (if (outline-invisible-p) (org-end-of-subtree nil t))))
(if (equal arg '(16)) (setq arg 'nextset)) (if (equal arg '(16)) (setq arg 'nextset))
(let ((org-blocker-hook org-blocker-hook) (let ((org-blocker-hook org-blocker-hook)
(case-fold-search nil)) commentp
case-fold-search)
(when (equal arg '(64)) (when (equal arg '(64))
(setq arg nil org-blocker-hook nil)) (setq arg nil org-blocker-hook nil))
(when (and org-blocker-hook (when (and org-blocker-hook
@ -11449,6 +11450,9 @@ For calling through lisp, arg is also interpreted in the following way:
(save-excursion (save-excursion
(catch 'exit (catch 'exit
(org-back-to-heading t) (org-back-to-heading t)
(when (looking-at (concat "^\\*+ " org-comment-string))
(org-toggle-comment)
(setq commentp t))
(if (looking-at org-outline-regexp) (goto-char (1- (match-end 0)))) (if (looking-at org-outline-regexp) (goto-char (1- (match-end 0))))
(or (looking-at (concat " +" org-todo-regexp "\\( +\\|[ \t]*$\\)")) (or (looking-at (concat " +" org-todo-regexp "\\( +\\|[ \t]*$\\)"))
(looking-at "\\(?: *\\|[ \t]*$\\)")) (looking-at "\\(?: *\\|[ \t]*$\\)"))
@ -11624,7 +11628,8 @@ For calling through lisp, arg is also interpreted in the following way:
(and (looking-at " ") (just-one-space)))) (and (looking-at " ") (just-one-space))))
(when org-trigger-hook (when org-trigger-hook
(save-excursion (save-excursion
(run-hook-with-args 'org-trigger-hook change-plist))))))))) (run-hook-with-args 'org-trigger-hook change-plist)))
(when commentp (org-toggle-comment))))))))
(defun org-block-todo-from-children-or-siblings-or-parent (change-plist) (defun org-block-todo-from-children-or-siblings-or-parent (change-plist)
"Block turning an entry into a TODO, using the hierarchy. "Block turning an entry into a TODO, using the hierarchy.