diff options
author | Nick Dokos <nicholas.dokos@hp.com> | 2011-03-14 05:48:15 +0000 |
---|---|---|
committer | Carsten Dominik <carsten.dominik@gmail.com> | 2011-04-08 12:10:32 +0200 |
commit | 9e15cf4fc296a5a1093aa912b0a6abd37e865f9a (patch) | |
tree | a3502a88ac9639ce2a310743860ab4c6720f3157 | |
parent | cd806a5d0d9d84706ead33ce8536960abb2cfe21 (diff) | |
download | org-mode-9e15cf4fc296a5a1093aa912b0a6abd37e865f9a.tar.gz |
Fix begin/end comment
* lisp/org-exp.el (org-export-remove-comment-blocks-and-subtrees): Fix regexp.
Rasmus <rasmus.pank@gmail.com> wrote:
> Hi,
> It seems that
>
> ,----
> | #+BEGIN_COMMENT
> | ...
> | #+END_COMMENT
> `----
>
> Might be broken in Org-mode 7.5. According to the manual,
>
> ,----
> | Finally, regions surrounded by
> | #+BEGIN_COMMENT ... #+END_COMMENT will not be exported.
> `----
>
> Consider the following example generated with Org-mode 7.5 in Emacs 24.0.50
> (started without config files).
>
> ,----
> | #+TITLE: this is a test
> |
> | #+BEGIN_COMMENT
> | Don't export me
> | #+END_COMMENT
> |
> | I'd like to be exposed
> `----
>
> The HTML export is:
>
> ,----
> | <snip>
> | <h1 class="title">this is a test</h1>
> |
> | <div class="org-comment">
> | </br>
> | <p>
> | <p>
> | Don't export me
> | </p>
> | </div>
> |
> | I'd like to be exposed
> | <snip>
> `----
>
> The LaTeX export is:
>
> ,----
> | \begin{verbatim}
> | Don't export me
> | \end{verbatim}
> | I'd like to be exposed
> `----
>
Indeed.
It seems that one of the hair-raising regexps that Carsten manages
to come up with is not quite right. Try this patch for now:
--8<---------------cut here---------------start------------->8---
--8<---------------cut here---------------end--------------->8---
Nick
-rw-r--r-- | lisp/org-exp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org-exp.el b/lisp/org-exp.el index eb2621b..8111e1c 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -1879,7 +1879,7 @@ table line. If it is a link, add it to the line containing the link." (goto-char (point-min)) (setq case-fold-search t) (while (re-search-forward - "^#\\+begin_comment[ \t]*\n[^\000]*?^#\\+end_comment\\>.*" nil t) + "^#\\+begin_comment[ \t]*\n[^\000]*?\n#\\+end_comment\\>.*" nil t) (replace-match "" t t)) ;; Remove subtrees that are commented (goto-char (point-min)) |