diff options
author | Bastien Guerry <bzg@altern.org> | 2011-02-12 16:53:21 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2011-02-12 16:53:21 +0100 |
commit | 2df6f65e237920339c773ff2499cf060bc83fa32 (patch) | |
tree | cf543ddd1aec1f1d36d3c741773d98d0749aa336 | |
parent | 8ec508b1284174860d97084f1c522bf21051e6a7 (diff) | |
parent | 775d962788c6105dc3ba71722b497d1293b53ce4 (diff) | |
download | org-mode-2df6f65e237920339c773ff2499cf060bc83fa32.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | lisp/ob.el | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -893,7 +893,8 @@ may be specified in the current buffer." (org-babel-merge-params org-babel-current-buffer-properties (org-babel-parse-header-arguments - (org-match-string-no-properties 2)))))))))) + (org-match-string-no-properties 2))))) + org-babel-current-buffer-properties))))) (defvar org-src-preserve-indentation) (defun org-babel-parse-src-block-match () |