From 1b3783fc3b33e5e13f86dc96360d58b7f12326ca Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 31 Dec 2010 11:32:39 +0100 Subject: [PATCH 08/10] Move org-eval * org.el (org-eval): Move from org-agenda.el. Signed-off-by: Julien Danjou --- lisp/org-agenda.el | 6 ------ lisp/org.el | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 107dcac..f58ebe1 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5335,12 +5335,6 @@ The modified list may contain inherited tags, and tags matched by (append new list) (append list new))))) -(defun org-eval (form) - "Eval FORM and return result." - (condition-case error - (eval form) - (error (format "%%![Error: %s]" error)))) - (defun org-compile-prefix-format (key) "Compile the prefix format into a Lisp form that can be evaluated. The resulting form is returned and stored in the variable diff --git a/lisp/org.el b/lisp/org.el index 56f0468..abf825e 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -18867,6 +18867,11 @@ work correctly." ;;; Other stuff. +(defun org-eval (form) + "Eval FORM and return result." + (condition-case error + (eval form) + (error (format "%%![Error: %s]" error)))) (defun org-insert-and-inherit-partially (&rest args) "Insert the arguments at point, partially inheriting properties from adjoining text. -- 1.7.2.3