diff options
author | Sebastien Vauban <sva-news@invalid.mygooglest.com> | 2013-04-27 11:40:25 +0200 |
---|---|---|
committer | Eric Schulte <schulte.eric@gmail.com> | 2013-05-06 16:32:22 -0400 |
commit | e79e8943ded4f1e3f2929560a3496fae8eec73c5 (patch) | |
tree | e4ad2c41ee76a7f873a58b2fbf7bef31eba95fe7 | |
parent | 30c0ceb8ececa1b4bc60d745b5f43cb7a34e0b81 (diff) | |
download | org-mode-e79e8943ded4f1e3f2929560a3496fae8eec73c5.tar.gz |
Fix priority order for inheriting header arguments
* ob-core.el (org-babel-parse-src-block-match): Fix order of list of header
arguments.
-rw-r--r-- | lisp/ob-core.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 8c1f09a..06d2520 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -1,6 +1,6 @@ ;;; ob-core.el --- working with code blocks in org-mode -;; Copyright (C) 2009-2012 Free Software Foundation, Inc. +;; Copyright (C) 2009-2013 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison @@ -1329,8 +1329,8 @@ may be specified in the properties of the current outline entry." (buffer-string))) (org-babel-merge-params org-babel-default-header-args - (org-babel-params-from-properties lang) (if (boundp lang-headers) (eval lang-headers) nil) + (org-babel-params-from-properties lang) (org-babel-parse-header-arguments (org-no-properties (or (match-string 4) "")))) switches |