summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-12-20 15:50:04 +0100
committerCarsten Dominik <carsten.dominik@gmail.com>2010-12-20 15:50:04 +0100
commitf9e174b74ed197cd61781936b08fb926140c393c (patch)
tree1b4c660ee31921fc3d66dd51a4fc4953849f1766
parentf11b134b46fa7aeb16eb18861ca49529af6822b2 (diff)
parentf73b121549ac5036a1320ab121879f077448fff1 (diff)
downloadorg-mode-f9e174b74ed197cd61781936b08fb926140c393c.tar.gz
Merge branch 't/patch490'
-rw-r--r--lisp/org-capture.el5
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 035f606..85747ee 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1207,10 +1207,7 @@ The template may still contain \"%?\" for cursor positioning."
(goto-char (match-beginning 0))
(let ((template-start (point)))
(forward-char 1)
- (let ((result
- (condition-case error
- (eval (read (current-buffer)))
- (error (format "%%![Error: %s]" error)))))
+ (let ((result (org-eval (read (current-buffer)))))
(delete-region template-start (point))
(insert result)))))