[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Orgmode] [PATCH 2/4] Allow an explicitly nil :tstart and :tend to suppr
From: |
Jason Riedy |
Subject: |
[Orgmode] [PATCH 2/4] Allow an explicitly nil :tstart and :tend to suppress the strings. |
Date: |
Sun, 4 May 2008 18:54:41 -0700 |
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 <address@hidden>
---
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 <address@hidden>
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