summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-12-21 08:26:41 +0100
committerCarsten Dominik <carsten.dominik@gmail.com>2010-12-21 08:26:41 +0100
commit7f8b09e67cfc9481a237d3d7f9b4d0e53c21f15c (patch)
treee5f0117d12284306ecbc4a41380e3269920e489a
parentce157879de978cda5f73149930bb0da898391403 (diff)
parent7faadf42e993639cb64cc56a54b485af3927b8bb (diff)
downloadorg-mode-7f8b09e67cfc9481a237d3d7f9b4d0e53c21f15c.tar.gz
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
-rw-r--r--contrib/lisp/org-collector.el32
1 files changed, 1 insertions, 31 deletions
diff --git a/contrib/lisp/org-collector.el b/contrib/lisp/org-collector.el
index 1d4f042..d84c3ee 100644
--- a/contrib/lisp/org-collector.el
+++ b/contrib/lisp/org-collector.el
@@ -109,36 +109,6 @@ a column, or through the generation of an error.")
'error-conditions
'(error column-prop-error org-collector-error))
-(defun org-read-prop (prop)
- "Convert the string property PROP to a number if appropriate.
-If prop looks like a list (meaning it starts with a '(') then
-read it as lisp expression, otherwise return it unmodified as a
-string.
-
-Results of calling:
-\(org-read-prop \"12\") -> 12
-\(org-read-prop \"(1 2 3)\") -> (1 2 3)
-\(org-read-prop \"+0\") -> 0
-\(org-read-prop \"aaa\") -> \"aaa\""
- (if (and (stringp prop) (not (equal prop "")))
- (let ((out (string-to-number prop)))
- (if (equal out 0)
- (cond
- ((or
- (equal "(" (substring prop 0 1))
- (equal "'" (substring prop 0 1)))
-
- (condition-case nil
- (read prop)
- (error prop)))
- ((string-match "^\\(+0\\|-0\\|0\\)$" prop)
- 0)
- (t
- (set-text-properties 0 (length prop) nil prop)
- prop))
- out))
- prop))
-
(defun org-dblock-write:propview (params)
"collect the column specification from the #+cols line
preceeding the dblock, then update the contents of the dblock."
@@ -195,7 +165,7 @@ variables and values specified in props"
match scope)))
;; read property values
(header-props (mapcar (lambda (props)
- (mapcar (lambda (pair) (cons (car pair) (org-read-prop (cdr pair))))
+ (mapcar (lambda (pair) (cons (car pair) (org-babel-read (cdr pair))))
props))
header-props))
;; collect all property names