mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-25 07:27:57 +00:00
Code

Merge branch 'hotfix-7.8.06'

Browse Source 
Conflicts:
	lisp/ob-exp.el
This commit is contained in:
Bastien Guerry 2012-04-01 21:52:01 +02:00
commit 63fdc375a3
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ob-exp.el
View File

@ -257,7 +257,7 @@ replaced with its value."
(org-babel-noweb-wrap) "" (nth 1 info)) (org-babel-noweb-wrap) "" (nth 1 info))
(if (org-babel-noweb-p (nth 2 info) :export) (if (org-babel-noweb-p (nth 2 info) :export)
(org-babel-expand-noweb-references (org-babel-expand-noweb-references
info (org-babel-exp-get-export-buffer)) info (org-babel-exp-get-export-buffer))
(nth 1 info)))) (nth 1 info))))
(org-fill-template (org-fill-template
org-babel-exp-code-template org-babel-exp-code-template
@ -271,6 +271,9 @@ replaced with its value."
(nth 2 info)) (nth 2 info))
("flags" . ,((lambda (f) (when f (concat " " f))) (nth 3 info))) ("flags" . ,((lambda (f) (when f (concat " " f))) (nth 3 info)))
("name" . ,(or (nth 4 info) ""))))) ("name" . ,(or (nth 4 info) "")))))
("body" . ,(if (string= (nth 0 info) "org")
(replace-regexp-in-string "^" "," (nth 1 info))
(nth 1 info))))))
(defun org-babel-exp-results (info type &optional silent hash) (defun org-babel-exp-results (info type &optional silent hash)
"Evaluate and return the results of the current code block for export. "Evaluate and return the results of the current code block for export.
@ -283,7 +286,7 @@ inhibit insertion of results into the buffer."
(let ((lang (nth 0 info)) (let ((lang (nth 0 info))
(body (if (org-babel-noweb-p (nth 2 info) :eval) (body (if (org-babel-noweb-p (nth 2 info) :eval)
(org-babel-expand-noweb-references (org-babel-expand-noweb-references
info (org-babel-exp-get-export-buffer)) info (org-babel-exp-get-export-buffer))
(nth 1 info))) (nth 1 info)))
(info (copy-sequence info))) (info (copy-sequence info)))
;; skip code blocks which we can't evaluate ;; skip code blocks which we can't evaluate

2
lisp/ob-fortran.el
View File

@ -1,6 +1,6 @@
;;; ob-fortran.el --- org-babel functions for fortran ;;; ob-fortran.el --- org-babel functions for fortran
;; Copyright (C) 2011-2012 Sergey Litvinov, Eric Schulte ;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte ;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte
;; Keywords: literate programming, reproducible research, fortran ;; Keywords: literate programming, reproducible research, fortran

4
lisp/org.el
View File

@ -11313,7 +11313,7 @@ For calling through lisp, arg is also interpreted in the following way:
(interpret (nth 1 ass)) (interpret (nth 1 ass))
(done-word (nth 3 ass)) (done-word (nth 3 ass))
(final-done-word (nth 4 ass)) (final-done-word (nth 4 ass))
(last-state (or this "")) (org-last-state (or this ""))
(completion-ignore-case t) (completion-ignore-case t)
(member (member this org-todo-keywords-1)) (member (member this org-todo-keywords-1))
(tail (cdr member)) (tail (cdr member))
@ -11379,7 +11379,7 @@ For calling through lisp, arg is also interpreted in the following way:
(car tail)))) (car tail))))
(state (or (state (or
(run-hook-with-args-until-success (run-hook-with-args-until-success
'org-todo-get-default-hook state last-state) 'org-todo-get-default-hook state org-last-state)
state)) state))
(next (if state (concat " " state " ") " ")) (next (if state (concat " " state " ") " "))
(change-plist (list :type 'todo-state-change :from this :to state (change-plist (list :type 'todo-state-change :from this :to state