From 7c87cbb42512eea0a7e45255cf6769a7d83b60f1 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Fri, 24 Apr 2020 20:01:38 +0200 Subject: [PATCH] don't reset defaults with backend() --- src/args.jl | 15 +++++++-------- src/backends.jl | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/args.jl b/src/args.jl index 0d0394d2..e2bf2128 100644 --- a/src/args.jl +++ b/src/args.jl @@ -680,15 +680,14 @@ function default(k::Symbol, v) k in _suppress_warnings || error("Unknown key: ", k) end -function default(; kw...) - if isempty(kw) +function default(; reset = true, kw...) + if reset && isempty(kw) reset_defaults() - else - kw = KW(kw) - RecipesPipeline.preprocess_attributes!(kw) - for (k,v) in kw - default(k, v) - end + end + kw = KW(kw) + RecipesPipeline.preprocess_attributes!(kw) + for (k,v) in kw + default(k, v) end end diff --git a/src/backends.jl b/src/backends.jl index 5a64f241..35b0853a 100644 --- a/src/backends.jl +++ b/src/backends.jl @@ -30,7 +30,7 @@ macro init_backend(s) esc(quote struct $T <: AbstractBackend end export $sym - $sym(; kw...) = (default(; kw...); backend($T())) + $sym(; kw...) = (default(; reset = false, kw...); backend($T())) backend_name(::$T) = Symbol($str) backend_package_name(pkg::$T) = backend_package_name(Symbol($str)) push!(_backends, Symbol($str))