From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Riedy Subject: [PATCH 2/4] Allow an explicitly nil :tstart and :tend to suppress the strings. Date: Sun, 4 May 2008 18:54:41 -0700 Message-ID: <1209952483-23714-3-git-send-email-jason@acm.org> References: <1209952483-23714-1-git-send-email-jason@acm.org> <1209952483-23714-2-git-send-email-jason@acm.org> Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jspux-0006VT-8F for emacs-orgmode@gnu.org; Sun, 04 May 2008 21:55:03 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jspuu-0006Tq-4X for emacs-orgmode@gnu.org; Sun, 04 May 2008 21:55:01 -0400 Received: from [199.232.76.173] (port=33058 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jsput-0006TO-NJ for emacs-orgmode@gnu.org; Sun, 04 May 2008 21:54:59 -0400 Received: from b.mail.sonic.net ([64.142.19.5]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Jsput-0004CC-BR for emacs-orgmode@gnu.org; Sun, 04 May 2008 21:54:59 -0400 In-Reply-To: <1209952483-23714-2-git-send-email-jason@acm.org> 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: emacs-orgmode@gnu.org Cc: Jason Riedy Passing explicit nils to leave out start and end strings feels natural. Also, transforming org-mode tables into other org-mode tables can use :tstart and :tend to specify directives, so I don't want to change the default splice setting for those. Signed-off-by: Jason Riedy --- ChangeLog | 2 ++ lisp/org-table.el | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69710ec..d70bc98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * lisp/org-table.el (*orgtbl-default-fmt*): New variable. (orgtbl-format-line): Use the value of *orgtbl-default-fmt* when there is no other fmt available. + (orgtbl-to-generic): Allow an explicitly nil :tstart or + :tend to suppress the appropriate string. 2008-05-02 Carsten Dominik diff --git a/lisp/org-table.el b/lisp/org-table.el index 17441cd..19dd74a 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -3773,8 +3773,10 @@ directly by `orgtbl-send-table'. See manual." ;; Put header (unless splicep - (push (or (orgtbl-eval-str (plist-get params :tstart)) - "ERROR: no :tstart") *orgtbl-rtn*)) + (if (not (plist-member params :tstart)) + (push "ERROR: no :tstart" *orgtbl-rtn*) + (let ((tstart (orgtbl-eval-str (plist-get params :tstart)))) + (if tstart (push tstart *orgtbl-rtn*))))) ;; Do we have a heading section? If so, format it and handle the ;; trailing hline. @@ -3801,8 +3803,10 @@ directly by `orgtbl-send-table'. See manual." (orgtbl-format-section nil) (unless splicep - (push (or (orgtbl-eval-str (plist-get params :tend)) - "ERROR: no :tend") *orgtbl-rtn*)) + (if (not (plist-member params :tend)) + (push "ERROR: no :tend" *orgtbl-rtn*) + (let ((tend (orgtbl-eval-str (plist-get params :tend)))) + (if tend (push tend *orgtbl-rtn*))))) (mapconcat 'identity (nreverse (if remove-nil-linesp (remq nil *orgtbl-rtn*) -- 1.5.5.rc1.121.g1594