From e79e8943ded4f1e3f2929560a3496fae8eec73c5 Mon Sep 17 00:00:00 2001 From: Sebastien Vauban Date: Sat, 27 Apr 2013 11:40:25 +0200 Subject: [PATCH] Fix priority order for inheriting header arguments * ob-core.el (org-babel-parse-src-block-match): Fix order of list of header arguments. --- lisp/ob-core.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 8c1f09a8f..06d2520fa 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 -- 2.11.4.GIT