From dadb93605aaef5b77837227ddd18b6e2448a00f1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 15 Mar 2014 15:32:59 +0100 Subject: [PATCH 1/2] ob-tangle: Fix `org-babel-under-commented-heading-p' * lisp/ob-tangle.el (org-babel-under-commented-heading-p): `org-comment-string' is case sensitive and cannot be attached to other text. --- lisp/ob-tangle.el | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index 2910d7f..bf67410 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -359,12 +359,17 @@ that the appropriate major-mode is set. SPEC has the form: (defvar org-comment-string) ;; Defined in org.el (defun org-babel-under-commented-heading-p () - "Return t if currently under a commented heading." - (unless (org-before-first-heading-p) - (if (let ((hd (nth 4 (org-heading-components)))) - (and hd (string-match (concat "^" org-comment-string) hd))) - t - (save-excursion + "Non-nil if point is under a commented heading. +This function also checks ancestors of the current headline, if +any." + (cond + ((org-before-first-heading-p) nil) + ((let ((headline (nth 4 (org-heading-components)))) + (and headline + (let ((case-fold-search nil)) + (org-string-match-p (concat "^" org-comment-string "\\(?: \\|$\\)") + headline))))) + (t (save-excursion (and (org-up-heading-safe) (org-babel-under-commented-heading-p)))))) -- 1.9.0