From 1f7360c5848b9fd7363bc607dd61024a69272003 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Tue, 6 May 2008 14:17:53 +0200 Subject: [PATCH] Provide an *orgtbl-default-fmt* for entries not in a fmt plist. 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 Conflicts: ChangeLog --- ChangeLog | 3 +++ lisp/org-table.el | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 655172bb8..7010d169f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,9 +17,12 @@ * lisp/org-exp.el (org-export-as-html, org-close-li): Implement description lists. +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. + (orgtbl-to-generic): Allow an explicitly nil :tstart or :tend to suppress the appropriate string. diff --git a/lisp/org-table.el b/lisp/org-table.el index 62dfe0b4a..af12a4c63 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)