aboutsummaryrefslogtreecommitdiff
path: root/alacritty/src/event.rs
diff options
context:
space:
mode:
authorChristian Duerr <contact@christianduerr.com>2020-08-21 15:48:48 +0000
committerGitHub <noreply@github.com>2020-08-21 18:48:48 +0300
commit3c3e6870dedad56b270f5b65ea57d5a6e46b1de6 (patch)
tree84a4e306a1c198f1bb81a090cb41f7b062e3f736 /alacritty/src/event.rs
parent3a7130086a8b5fa95c46a15d5b09a220be57708c (diff)
downloadr-alacritty-3c3e6870dedad56b270f5b65ea57d5a6e46b1de6.tar.gz
r-alacritty-3c3e6870dedad56b270f5b65ea57d5a6e46b1de6.tar.bz2
r-alacritty-3c3e6870dedad56b270f5b65ea57d5a6e46b1de6.zip
Add configuration file imports
This adds the ability for users to have multiple configuration files which all inherit from each other. The order of imports is chronological, branching out to the deepest children first and overriding every field with that of the configuration files that are loaded at a later point in time. Live config reload watches the directories of all configuration files, allowing edits in any of them to update Alacritty immediately. While the imports are live reloaded, a new configuration file watcher will only be spawned once Alacritty is restarted. Since this might cause loops which would be very difficult to detect, a maximum depth is set to limit the recursion possible with nested configuration files. Fixes #779.
Diffstat (limited to 'alacritty/src/event.rs')
-rw-r--r--alacritty/src/event.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/alacritty/src/event.rs b/alacritty/src/event.rs
index 9033049f..d0ce3601 100644
--- a/alacritty/src/event.rs
+++ b/alacritty/src/event.rs
@@ -1051,7 +1051,7 @@ impl<N: Notify + OnResize> Processor<N> {
processor.ctx.display_update_pending.dirty = true;
}
- let config = match config::reload_from(&path) {
+ let config = match config::load_from(&path) {
Ok(config) => config,
Err(_) => return,
};