From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Gauland Subject: [PATCH] Babel: Fix the #+END_ directive from the :wrap param Date: Wed, 5 Dec 2012 21:27:38 +0000 (UTC) Message-ID: References: <8738zkut64.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([208.118.235.92]:38589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgMXV-00046r-Cn for emacs-orgmode@gnu.org; Wed, 05 Dec 2012 16:29:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgMXS-0006Ez-Mg for emacs-orgmode@gnu.org; Wed, 05 Dec 2012 16:29:57 -0500 Received: from plane.gmane.org ([80.91.229.3]:48674) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgMXS-0006En-AD for emacs-orgmode@gnu.org; Wed, 05 Dec 2012 16:29:54 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1TgMXc-0004lS-4E for emacs-orgmode@gnu.org; Wed, 05 Dec 2012 22:30:04 +0100 Received: from 218-101-54-25.trimble.co.nz ([218.101.54.25]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 05 Dec 2012 22:30:04 +0100 Received: from mikelygee by 218-101-54-25.trimble.co.nz with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 05 Dec 2012 22:30:04 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org * lisp/ob.el: Only use the :wrap argument up to the first space when creating the #+END_ directive. Using an option like ":wrap SRC fundamental" was generating and end marker of "#+END_SRC fundamental", which caused the new exporter to fail to handle to block properly. TINYCHANGE --- lisp/ob.el | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) mode change 100644 => 100755 lisp/ob.el diff --git a/lisp/ob.el b/lisp/ob.el old mode 100644 new mode 100755 index c030a7f..563233e --- a/lisp/ob.el +++ b/lisp/ob.el @@ -1997,7 +1997,8 @@ code ---- the results are extracted in the syntax of the source (cond ((assoc :wrap (nth 2 info)) (let ((name (or (cdr (assoc :wrap (nth 2 info))) "RESULTS"))) - (funcall wrap (concat "#+BEGIN_" name) (concat "#+END_" name)))) + (funcall wrap (concat "#+BEGIN_" name) + (concat "#+END_" (car (split-string name)))))) ((member "html" result-params) (funcall wrap "#+BEGIN_HTML" "#+END_HTML")) ((member "latex" result-params) -- 1.7.9