Make language merging of markup etc. config without values in the root

Updates #10953

2 files changed, 7 insertions, 18 deletions

diff --git a/config/allconfig/allconfig.go b/config/allconfig/allconfig.go
index 22e9f1deb..4886aa561 100644
--- a/config/allconfig/allconfig.go
+++ b/config/allconfig/allconfig.go
@@ -748,8 +748,13 @@ func FromLoadConfigResult(fs afero.Fs, res config.LoadConfigResult) (*Configs, e
 						}
 					}
 				} else {
-					// Apply new values to the root.
-					differentRootKeys = append(differentRootKeys, "")
+					switch vv.(type) {
+					case maps.Params:
+						differentRootKeys = append(differentRootKeys, kk)
+					default:
+						// Apply new values to the root.
+						differentRootKeys = append(differentRootKeys, "")
+					}
 				}
 			}
 			differentRootKeys = helpers.UniqueStringsSorted(differentRootKeys)
diff --git a/config/allconfig/load.go b/config/allconfig/load.go
index 51c1bf279..6ae26d28e 100644
--- a/config/allconfig/load.go
+++ b/config/allconfig/load.go
@@ -214,22 +214,6 @@ func (l configLoader) normalizeCfg(cfg config.Provider) error {
 		cfg.Set("minify", maps.Params{"minifyOutput": true})
 	}
 
-	// Simplify later merge.
-	languages := cfg.GetStringMap("languages")
-	for _, v := range languages {
-		switch m := v.(type) {
-		case maps.Params:
-			// params have merge strategy deep by default.
-			// The languages config key has strategy none by default.
-			// This means that if these two sections does not exist on the left side,
-			// they will not get merged in, so just create some empty maps.
-			if _, ok := m["params"]; !ok {
-				m["params"] = maps.Params{}
-			}
-		}
-
-	}
-
 	return nil
 }