From 267015b24a4e6e28bc7a2740dad9ca02d6cea8e6 Mon Sep 17 00:00:00 2001
From: Eric Schulte <schulte.eric@gmail.com>
Date: Thu, 15 Sep 2011 15:22:14 -0600
Subject: [PATCH] differentiate between result types and wrappers

* lisp/ob.el (org-babel-merge-params): Differentiate between result
  types and wrappers.
---
 lisp/ob.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/ob.el b/lisp/ob.el
index e8bce1a7e..eec88f0e3 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -1803,8 +1803,8 @@ Later elements of PLISTS override the values of previous elements.
 This takes into account some special considerations for certain
 parameters when merging lists."
   (let ((results-exclusive-groups
-	 '(("file" "list" "vector" "table" "scalar" "verbatim" "raw" "org"
-            "html" "latex" "code" "pp" "wrap")
+	 '(("file" "list" "vector" "table" "scalar" "verbatim")
+	   ("raw" "org" "html" "latex" "code" "pp" "wrap")
 	   ("replace" "silent" "append" "prepend")
 	   ("output" "value")))
 	(exports-exclusive-groups