Merge branch 'maint'

* maint:
  [snmp] Correct bug when path to mib contains UTF-8 characters
  [ic] Fix but when UTF-8 character in path to idl spec
  sys_core_fold: Don't move a fun into a guard

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index 376d2c8e9a..ced0e39d06 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -26,7 +26,7 @@
 	 unused_multiple_values_error/1,unused_multiple_values/1,
 	 multiple_aliases/1,redundant_boolean_clauses/1,
 	 mixed_matching_clauses/1,unnecessary_building/1,
-	 no_no_file/1]).
+	 no_no_file/1,configuration/1]).
 
 -export([foo/0,foo/1,foo/2,foo/3]).
 
@@ -45,7 +45,7 @@ groups() ->
        unused_multiple_values_error,unused_multiple_values,
        multiple_aliases,redundant_boolean_clauses,
        mixed_matching_clauses,unnecessary_building,
-       no_no_file]}].
+       no_no_file,configuration]}].
 
 
 init_per_suite(Config) ->
@@ -499,4 +499,16 @@ experiment() ->
     end,
     ok.
 
+
+%% Make sure we don't try to move a fun into a guard.
+configuration(_Config) ->
+    {'EXIT',_} = (catch configuration()),
+    ok.
+
+configuration() ->
+    [forgotten || Components <- enemy, is_tuple(fun art/0)].
+
+art() ->
+ creating.
+
 id(I) -> I.