mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-02 07:15:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'no-conf-found-is-not-an-error'

Browse source
This commit is contained in:
Daniel Eklöf 2021-06-11 19:19:02 +02:00
commit 7ada4c0ab4
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -108,6 +108,9 @@
* Writing a sixel on top of another sixel no longer erases the first * Writing a sixel on top of another sixel no longer erases the first
sixel, but the two are instead blended sixel, but the two are instead blended
(https://codeberg.org/dnkl/foot/issues/562). (https://codeberg.org/dnkl/foot/issues/562).
* Running foot without a configuration file is no longer an error; it
has been demoted to a warning, and is no longer presented as a
notification in the terminal window, but only logged on stderr.
### Deprecated ### Deprecated

2
config.c
View file

@ -2662,7 +2662,7 @@ config_load(struct config *conf, const char *conf_path,
} else { } else {
conf_file = open_config(); conf_file = open_config();
if (conf_file.fd < 0) { if (conf_file.fd < 0) {
LOG_AND_NOTIFY_ERR("no configuration found, using defaults"); LOG_WARN("no configuration found, using defaults");
ret = !errors_are_fatal; ret = !errors_are_fatal;
goto out; goto out;
} }