From f7d62dee68c7c34866a5b4c5a17078dc4899cc9a Mon Sep 17 00:00:00 2001
From: "David N. Welton" <davidw@dedasys.com>
Date: Fri, 14 Feb 2014 11:48:51 +0100
Subject: Use proplists:unfold to make sure we feed a proplist to keymerge.

---
 src/rebar_erlydtl_compiler.erl | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/rebar_erlydtl_compiler.erl b/src/rebar_erlydtl_compiler.erl
index ae64bcb..df7186c 100644
--- a/src/rebar_erlydtl_compiler.erl
+++ b/src/rebar_erlydtl_compiler.erl
@@ -199,16 +199,17 @@ do_compile(Config, Source, Target, DtlOpts) ->
     %% versions of erlydtl.
     CompilerOptions = option(compiler_options, DtlOpts),
 
+    Sorted = proplists:unfold(
+               lists:sort(
+                 [{out_dir, option(out_dir, DtlOpts)},
+                  {doc_root, option(doc_root, DtlOpts)},
+                  {custom_tags_dir, option(custom_tags_dir, DtlOpts)},
+                  {compiler_options, CompilerOptions}
+                  |CompilerOptions])),
+
     %% ensure that doc_root and out_dir are defined,
     %% using defaults if necessary
-    Opts = lists:ukeymerge(1,
-            DtlOpts,
-            lists:sort(
-                [{out_dir, option(out_dir, DtlOpts)},
-                 {doc_root, option(doc_root, DtlOpts)},
-                 {custom_tags_dir, option(custom_tags_dir, DtlOpts)},
-                 {compiler_options, CompilerOptions}
-                 |CompilerOptions])),
+    Opts = lists:ukeymerge(1, DtlOpts, Sorted),
     ?INFO("Compiling \"~s\" -> \"~s\" with options:~n    ~s~n",
         [Source, Target, io_lib:format("~p", [Opts])]),
     case erlydtl:compile(Source,
-- 
cgit v1.1