From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Kelling Subject: Re: [PATCH] Fix error prone babel table output format detection Date: Thu, 01 May 2014 02:32:43 -0700 Message-ID: <87eh0dkfno.fsf@treetowl.lan> References: <20140501065231.5AE63181A42@treetowl.lan> <8761lqrn5p.fsf@Rainer.invalid> <87eh0dnbot.fsf@treetowl.lan> <87d2fxlv4u.fsf@treetowl.lan> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfnN2-0007nK-9o for emacs-orgmode@gnu.org; Thu, 01 May 2014 05:33:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WfnMx-0003KS-0q for emacs-orgmode@gnu.org; Thu, 01 May 2014 05:33:36 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:37515) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfnMw-0003KL-U0 for emacs-orgmode@gnu.org; Thu, 01 May 2014 05:33:30 -0400 In-Reply-To: <87d2fxlv4u.fsf@treetowl.lan> (Ian Kelling's message of "Thu, 01 May 2014 02:13:05 -0700") 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: Achim Gratz Cc: emacs-orgmode@gnu.org Ian Kelling writes: > Below is a patch that addresses the 2 previously mentioned > problems. It's a bit late. here is the same patch with correct indentation. > -- >8 -- Subject: [PATCH] Fix error prone babel table output format detection * lisp/ob-core.el: Test that all elements are in a list are lists or 'hline instead of just the first. org-babel table output uses different formatting for a list of lists, but detects it incorrectly causing an error. An example of a block causing an error is an emacs lisp source block containing just 1 line: '((1) 2) --- lisp/ob-core.el | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 1348f04..9eb2c7a 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -2184,9 +2184,16 @@ code ---- the results are extracted in the syntax of the source ((funcall proper-list-p result) (goto-char beg) (insert (concat (orgtbl-to-orgtbl - (if (or (eq 'hline (car result)) - (and (listp (car result)) - (listp (cdr (car result))))) + (if (let ((len (length result)) + (proper t) + (i 0) + elem) + (while (and proper (< i len )) + (setq elem (nth i result)) + (unless (or (listp elem) (eq elem 'hline)) + (setq proper nil)) + (setq i (1+ i))) + proper) result (list result)) '(:fmt (lambda (cell) (format "%s" cell)))) "\n")) (goto-char beg) (when (org-at-table-p) (org-table-align))) -- 1.7.10.4