From a2c8565c35569e94e50394f11f47a74fc890e002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=8E=E3=81=AE=E6=B5=81=E3=82=8C?=
 <2804556+usagi-flow@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:01:29 +0200
Subject: [PATCH] chore(evil): clarifications (#41)

* doc(evil): remove the mention of a different default theme

* refactor(evil): improve logging to avoid misconceptions

* doc(evil): we don't rebase that often anymore

* doc(evil): document the `editor.evil` option
---
 README.md                | 10 ++++++++--
 helix-term/src/config.rs |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index bdcbceb7..45c472ee 100644
--- a/README.md
+++ b/README.md
@@ -44,11 +44,17 @@ These are the current differences compared to the upstream project:
 -	Basic Vim modeline support ([#3](https://github.com/usagi-flow/evil-helix/pull/3))
 -	Adjusted defaults ([511060a](https://github.com/usagi-flow/evil-helix/commit/511060abcfcbe9377ec50e8a0ecaf4c0660776bb)):
 	-	The Helix "SEL" mode is called "VIS"
-	-	The default theme is `catppuccin_macchiato`
 	-	Smart tab is disabled by default
 -	If `color_modes` is enabled, color the file type in the statusline as well ([5503542](https://github.com/usagi-flow/evil-helix/commit/5503542c0314936ea91464f2944666ed42fea86c))
 -	Minimalistic window separator ([dd990ca](https://github.com/usagi-flow/evil-helix/commit/dd990cad1cb92a024321aca19728c68cb066dd09))
 
+Moreover, evil-helix introduces the `editor.evil` option, which is `true` by default. It can be set to false to completely deactivate evil-helix behavior without having to use a different build:
+
+```toml
+[editor]
+evil = true # Default; set this to `false` to disable evil-helix behavior
+```
+
 ## Project philosophy
 
 ### Configurable features instead of plugins
@@ -98,4 +104,4 @@ Considering the kind and frequency of changes to this repository, it makes sense
 
 ## Development
 
-Keep in mind the `main` branch is regularly being rebased onto the upstream `master` branch.
\ No newline at end of file
+Keep in mind the `main` branch may be rebased onto the upstream `master` branch.
\ No newline at end of file
diff --git a/helix-term/src/config.rs b/helix-term/src/config.rs
index b691524f..05bbcb82 100644
--- a/helix-term/src/config.rs
+++ b/helix-term/src/config.rs
@@ -187,7 +187,7 @@ impl Config {
                 .expect("Incorrect type for `editor.config`, expected `bool`");
         }
 
-        log::info!("Evil mode not set in local/global config");
+        log::debug!("Evil mode not explicitly set in local/global config, will enable default");
         return true;
     }