Merge branch 'bugfix'

lisp/ob-core.el

@@ -1689,6 +1689,7 @@ shown below.
 			 (append
 			  (split-string (if (stringp raw-result)
 					    raw-result
+                                          ;; FIXME: Arbitrary code evaluation.
 					  (eval raw-result t)))
 			  (cdr (assq :result-params params))))))
     (append
@@ -2859,6 +2860,7 @@ parameters when merging lists."
 				  (split-string
 				   (cond ((stringp value) value)
                                          ((functionp value) (funcall value))
+                                         ;; FIXME: Arbitrary code evaluation.
                                          (t (eval value t)))))))
 	  (`(:exports . ,value)
 	   (setq exports (funcall merge
@@ -3187,16 +3189,8 @@ situations in which is it not appropriate."
 	((and (not inhibit-lisp-eval)
 	      (or (memq (string-to-char cell) '(?\( ?' ?` ?\[))
 		  (string= cell "*this*")))
-         ;; Prevent arbitrary function calls.
-         (if (and (memq (string-to-char cell) '(?\( ?`))
-                  (not (org-babel-confirm-evaluate
-                      ;; See `org-babel-get-src-block-info'.
-                      (list "emacs-lisp" cell
-                            '((:eval . yes)) nil (format "%s" cell)
-                            nil nil))))
-             ;; Not allowed.
-             (user-error "Evaluation of elisp code %S aborted." cell)
-	   (eval (read cell) t)))
+         ;; FIXME: Arbitrary code evaluation.
+	 (eval (read cell) t))
 	((save-match-data
            (and (string-match "^[[:space:]]*\"\\(.*\\)\"[[:space:]]*$" cell)
                 (not (string-match "[^\\]\"" (match-string 1 cell)))))

lisp/org-table.el

@@ -2614,6 +2614,7 @@ location of point."
 
 	(if lispp
 	    (setq ev (condition-case nil
+                         ;; FIXME: Arbitrary code evaluation.
 			 (eval (eval (read form)))
 		       (error "#ERROR"))
 		  ev (if (numberp ev) (number-to-string ev) ev)