1769288238

2026-01-24 22:57:18 +02:00
parent fa32ae5510
commit 84020b1572
94 changed files with 1428 additions and 1024 deletions
@@ -0,0 +1,17 @@
+--- a/helix-term/src/config.rs
+++ b/helix-term/src/config.rs
+@@ -58,12 +58,11 @@ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ impl Config {
+     pub fn load(
+         global: Result<String, ConfigLoadError>,
+-        local: Result<String, ConfigLoadError>,
+        _local: Result<String, ConfigLoadError>,
+     ) -> Result<Config, ConfigLoadError> {
+         let global_config: Result<ConfigRaw, ConfigLoadError> =
+             global.and_then(|file| toml::from_str(&file).map_err(ConfigLoadError::BadConfig));
+-        let local_config: Result<ConfigRaw, ConfigLoadError> =
+-            local.and_then(|file| toml::from_str(&file).map_err(ConfigLoadError::BadConfig));
+        let local_config: Result<ConfigRaw, ConfigLoadError> = Err(ConfigLoadError::default());
+         let res = match (global_config, local_config) {
+             (Ok(global), Ok(local)) => {
+                 let mut keys = keymap::default();