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: Wed, 07 May 2014 13:57:42 -0700 Message-ID: <87mwetezzs.fsf@treetowl.lan> References: <20140501065231.5AE63181A42@treetowl.lan> <8761lqrn5p.fsf@Rainer.invalid> <87eh0dnbot.fsf@treetowl.lan> <87d2fxlv4u.fsf@treetowl.lan> <87eh0dkfno.fsf@treetowl.lan> <87bnvhhlhn.fsf@treetowl.lan> <87bnvda5sx.fsf@gmail.com> <87k3a1w7fc.fsf@treetowl.lan> <87mweune56.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WicGt-000500-Cj for emacs-orgmode@gnu.org; Fri, 09 May 2014 00:19:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WicGo-000244-3y for emacs-orgmode@gnu.org; Fri, 09 May 2014 00:18:55 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:37993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WicGn-00023t-W5 for emacs-orgmode@gnu.org; Fri, 09 May 2014 00:18:50 -0400 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: Eric Schulte Cc: Achim Gratz , emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Eric Schulte writes: > This looks good to me. Could you reformat the patch with > > git format-patch > > and attach the results (this will be easier to apply). Done. I was actually following the instructions in man git-format-patch by not attaching it before, but I will avoid that in future. > Also, this patch > is small enough to apply without any sort of copyright attribution, but > if you think you might make larger contributions in the future, please > look over the org contribution instructions [1].> I've completed emacs fsf copyright assignment. I also have another patch that has been on the mailing list for about 2 weeks or so waiting for a reply. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-Fix-error-prone-babel-table-output-format-detection.patch >From 4122d20f1253c2cbf5e73070ea00665bbc802275 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 30 Apr 2014 21:56:52 -0700 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 1348f04..4ddafaf 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -2184,9 +2184,9 @@ 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 (org-every + (lambda (el) (or (listp el) (eq el 'hline))) + result) 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 --=-=-=--