Merge branch 'master' into feature/binary_as_text

src/bin/bat/main.rs

@@ -202,7 +202,7 @@ pub fn list_themes(cfg: &Config, config_dir: &Path, cache_dir: &Path) -> Result<
 
     let default_theme = HighlightingAssets::default_theme();
     for theme in assets.themes() {
-        let default_theme_info = if default_theme == theme {
+        let default_theme_info = if !config.loop_through && default_theme == theme {
             " (default)"
         } else {
             ""

src/syntax_mapping/builtins/common/50-json.toml

@@ -1,3 +1,3 @@
 # JSON Lines is a simple variation of JSON #2535
 [mappings]
-"JSON" = ["*.jsonl", "*.jsonc", "*.jsonld"]
+"JSON" = ["*.jsonl", "*.jsonc", "*.jsonld", "*.geojson"]

src/syntax_mapping/builtins/common/50-markdown.toml

@@ -0,0 +1,2 @@
+[mappings]
+"Markdown" = ["*.mkd"]

src/syntax_mapping/builtins/linux/50-kubernetes.toml

@@ -0,0 +1,2 @@
+[mappings]
+"YAML" = ["/etc/kubernetes/*.conf"]