git.iko.soy/bat
on master help sign in
Merge remote-tracking branch 'origin/master' into fix-1063
commit552545fe5f807f7fca51ab5a52cebcd15dd0021a authorMartin Nordholts <enselic@gmail.com> dateMon 28 Dec 2020, 22:48 (6 years ago) parentdcfe883f45fa5e
2 files changed+11−3
compare with master
unifiedsplit
CHANGELOG.md+1 src/assets.rs+10−3
CHANGELOG.md+1
@@ -10,6 +10,7 @@
1010- Only print themes hint in interactive mode (`bat --list-themes`), see #1439 (@rsteube)
1111- Make ./tests/syntax-tests/regression_test.sh work on recent versions of macOS, see #1443 (@Enselic)
1212- VimL syntax highlighting fix, see #1450 (@esensar)
13+- Print an 'Invalid syntax theme settings' error message if a custom theme is broken, see #614 (@Enselic)
1314- Ignore PAGER=most with a warning to stderr, but allow override with BAT_PAGER or --config, see #1063 (@Enselic)
1415
1516## Other
src/assets.rs+10−3
@@ -38,9 +38,16 @@ impl HighlightingAssets {
3838 };
3939
4040 let theme_dir = source_dir.join("themes");
41−
42− let res = theme_set.add_from_folder(&theme_dir);
43− if res.is_err() {
41+ if theme_dir.exists() {
42+ let res = theme_set.add_from_folder(&theme_dir);
43+ if let Err(err) = res {
44+ println!(
45+ "Failed to load one or more themes from '{}' (reason: '{}')",
46+ theme_dir.to_string_lossy(),
47+ err,
48+ );
49+ }
50+ } else {
4451 println!(
4552 "No themes were found in '{}', using the default set",
4653 theme_dir.to_string_lossy()