From e8b2a120c2a33b95e0e82d6672655df36738f8e2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Mar 2015 09:59:08 +0100 Subject: [PATCH] ox: Fix `org-export--delete-commented-subtrees' * lisp/ox.el (org-export--delete-commented-subtrees): Match COMMENT subtree even with a priority cookie or a TODO keyword. --- lisp/ox.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/ox.el b/lisp/ox.el index 939673a93..28be64ee8 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -2669,11 +2669,12 @@ The function assumes BUFFER's major mode is `org-mode'." "Delete commented subtrees or inlinetasks in the buffer." (org-with-wide-buffer (goto-char (point-min)) - (let ((regexp (concat org-outline-regexp-bol org-comment-string))) + (let ((regexp (concat org-outline-regexp-bol ".*" org-comment-string))) (while (re-search-forward regexp nil t) - (delete-region - (line-beginning-position) - (org-element-property :end (org-element-at-point))))))) + (let ((e (org-element-at-point))) + (when (org-element-property :commentedp e) + (delete-region (org-element-property :begin e) + (org-element-property :end e)))))))) (defun org-export--prune-tree (data info) "Prune non exportable elements from DATA.