From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Riedy Subject: [PATCH 1/4] Provide an *orgtbl-default-fmt* for entries not in a fmt plist. Date: Sun, 4 May 2008 18:54:40 -0700 Message-ID: <1209952483-23714-2-git-send-email-jason@acm.org> References: <1209952483-23714-1-git-send-email-jason@acm.org> Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jspuw-0006UU-4P for emacs-orgmode@gnu.org; Sun, 04 May 2008 21:55:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jsput-0006TV-VZ for emacs-orgmode@gnu.org; Sun, 04 May 2008 21:55:00 -0400 Received: from [199.232.76.173] (port=33054 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jsput-0006TK-Mz 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-0004CE-Ba for emacs-orgmode@gnu.org; Sun, 04 May 2008 21:54:59 -0400 In-Reply-To: <1209952483-23714-1-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 The *orgtbl-default-fmt* is a hook for orgtbl transformations to ensure a destination-sensible default for columns not present in a fmt plist. The leaving the value at nil changes no existing behavior. Signed-off-by: Jason Riedy --- ChangeLog | 6 ++++++ lisp/org-table.el | 5 ++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15c9602..69710ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-04 Jason Riedy + + * 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. + 2008-05-02 Carsten Dominik * lisp/org.el (org-read-date-analyze): "." as an alias for "+0" in diff --git a/lisp/org-table.el b/lisp/org-table.el index ef1d932..17441cd 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -3631,6 +3631,7 @@ First element has index 0, or I0 if given." ;; Formatting parameters for the current table section. (defvar *orgtbl-hline* nil "Text used for horizontal lines") (defvar *orgtbl-sep* nil "Text used as a column separator") +(defvar *orgtbl-default-fmt* nil "Default format for each entry") (defvar *orgtbl-fmt* nil "Format for each entry") (defvar *orgtbl-efmt* nil "Format for numbers") (defvar *orgtbl-lfmt* nil "Format for an entire line, overrides fmt") @@ -3672,7 +3673,9 @@ First element has index 0, or I0 if given." (orgtbl-apply-fmt efmt (match-string 1 f) (match-string 2 f)) f))) - (orgtbl-apply-fmt (orgtbl-get-fmt *orgtbl-fmt* i) f))) + (orgtbl-apply-fmt (or (orgtbl-get-fmt *orgtbl-fmt* i) + *orgtbl-default-fmt*) + f))) line))) (push (if *orgtbl-lfmt* (orgtbl-apply-fmt *orgtbl-lfmt* line) -- 1.5.5.rc1.121.g1594