From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Eric Schulte" Subject: Re: Re: [BUG] nested blocks aren't protected on export Date: Mon, 28 Jun 2010 12:59:16 -0700 Message-ID: <87zkyf9be3.fsf@gmail.com> References: <876316cz9g.fsf@gmail.com> <8739w7ane7.fsf@gmail.com> <87wrtjb3mc.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from [140.186.70.92] (port=33692 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTKWe-0003YY-RR for emacs-orgmode@gnu.org; Mon, 28 Jun 2010 16:01:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OTKUD-00015G-Il for emacs-orgmode@gnu.org; Mon, 28 Jun 2010 15:59:22 -0400 Received: from mail-px0-f169.google.com ([209.85.212.169]:50360) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OTKUD-000157-E3 for emacs-orgmode@gnu.org; Mon, 28 Jun 2010 15:59:21 -0400 Received: by pxi17 with SMTP id 17so8266048pxi.0 for ; Mon, 28 Jun 2010 12:59:20 -0700 (PDT) In-Reply-To: (Carsten Dominik's message of "Mon, 28 Jun 2010 18:21:31 +0200") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Carsten Dominik Cc: Org Mode --=-=-= Carsten Dominik writes: [...] > > For now I don't see anything wrong with this. The fastest > way to find out is to put it into master and watch the list :-) > Please go ahead and do that. > I think this patch may have uncovered a bug in the export preprocessing which was previously being covered up by the over-eager comment pruning. I've now got another patch [1] which fixes the bug in `org-export-mark-blockquote-verse-center' which was leaving #+end_quote lines littered in the pre-processed files. If this looks good to you please do apply it, I'll run it locally in the meantime to see if any unexpected behavior develops. Thanks -- Eric > > Thanks. > > - Carsten Footnotes: [1] --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-org-exp-ensure-that-end_quote-lines-are-removed.patch >From 251647d34f599dd025bb08376c0a3eabac604c9d Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Mon, 28 Jun 2010 12:52:44 -0700 Subject: [PATCH] org-exp: ensure that #+end_quote lines are removed * lisp/org-exp.el (org-export-mark-blockquote-verse-center): ensure that the end_quote line is removed during buffer preprocessing --- lisp/org-exp.el | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index f0c11d6..1cd8fc2 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -1569,7 +1569,8 @@ These special cookies will later be interpreted by the backend." beg1 (1+ (match-end 0))) (when (re-search-forward (concat "^[ \t]*#\\+end_" type "\\>.*") nil t) (setq end (+ (point-at-eol) (if (looking-at "\n$") 1 0)) - end1 (1- (match-beginning 0))) + end1 (save-excursion (goto-char (1- (match-beginning 0))) + (point-at-bol))) (setq content (org-remove-indentation (buffer-substring beg1 end1))) (setq content (concat "ORG-" (upcase t1) "-START\n" content "\n" -- 1.7.0.4 --=-=-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode --=-=-=--