ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2011-03-02 18:15:35 +01:00
parent e7409b5cd1 85729e693e
commit eae2dffd67
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/org.texi
View File

@ -11941,7 +11941,7 @@ another by commas, as shown in the following example.
@subsubheading Emacs Lisp evaluation of variables @subsubheading Emacs Lisp evaluation of variables
Emacs lisp code can be used to initialize variable values. When a variable Emacs lisp code can be used to initialize variable values. When a variable
value starts with @code{(}, @code{'} or @code{`} it will be evaluated as value starts with @code{(}, @code{[}, @code{'} or @code{`} it will be evaluated as
Emacs Lisp and the result of the evaluation will be assigned as the variable Emacs Lisp and the result of the evaluation will be assigned as the variable
value. The following example demonstrates use of this evaluation to reliably value. The following example demonstrates use of this evaluation to reliably
pass the file-name of the org-mode buffer to a code block---note that pass the file-name of the org-mode buffer to a code block---note that

10
lisp/ob-exp.el
View File

@ -252,16 +252,16 @@ inhibit insertion of results into the buffer."
(org-babel-result-hash))))) (org-babel-result-hash)))))
(let ((lang (nth 0 info)) (let ((lang (nth 0 info))
(body (nth 1 info))) (body (nth 1 info)))
(setf (nth 2 info) (org-babel-exp-in-export-file lang
(org-babel-process-params (nth 2 info))))
;; skip code blocks which we can't evaluate ;; skip code blocks which we can't evaluate
(when (fboundp (intern (concat "org-babel-execute:" lang))) (when (fboundp (intern (concat "org-babel-execute:" lang)))
(org-babel-eval-wipe-error-buffer) (org-babel-eval-wipe-error-buffer)
(prog1 nil (prog1 nil
(setf (nth 2 info) (setf (nth 2 info)
(org-babel-merge-params (org-babel-exp-in-export-file lang
(nth 2 info) (org-babel-process-params
`((:results . ,(if silent "silent" "replace"))))) (org-babel-merge-params
(nth 2 info)
`((:results . ,(if silent "silent" "replace")))))))
(cond (cond
((or (equal type 'block) (equal type 'inline)) ((or (equal type 'block) (equal type 'inline))
(org-babel-execute-src-block nil info)) (org-babel-execute-src-block nil info))

4
lisp/ob.el
View File

@ -1924,7 +1924,9 @@ appropriate."
(if (and (not inhibit-lisp-eval) (if (and (not inhibit-lisp-eval)
(member (substring cell 0 1) '("(" "'" "`" "["))) (member (substring cell 0 1) '("(" "'" "`" "[")))
(eval (read cell)) (eval (read cell))
(progn (set-text-properties 0 (length cell) nil cell) cell))) (if (string= (substring cell 0 1) "\"")
(read cell)
(progn (set-text-properties 0 (length cell) nil cell) cell))))
cell)) cell))
(defun org-babel-number-p (string) (defun org-babel-number-p (string)