mirror of
https://github.com/dandavison/delta.git
synced 2026-10-10 19:49:11 +02:00
Dan Davison
5dc0d6ef7e
Unify handling of styles parsed from raw line and computed diff styles. This enables syntax highlighting to be used in color-moved sections. Fixes #72
724 B
724 B
commit fffb6bf94087c432b6e2e29cab97bf1f8987c641
Author: Dan Davison <dandavison7@gmail.com>
Date: Tue Nov 23 14:51:46 2021 -0500
DEBUG
diff --git a/src/config.rs b/src/config.rs
index efe6adb..9762222 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -400,6 +400,7 @@ fn make_blame_palette(blame_palette: Option<String>, is_light_mode: bool) -> Vec
+pub fn user_supplied_option(option: &str, arg_matches: &clap::ArgMatches) -> bool {
@@ -416,29 +433,30 @@ fn make_styles_map(opt: &cli::Opt) -> Option<HashMap<style::AnsiTermStyleEqualit
-pub fn user_supplied_option(option: &str, arg_matches: &clap::ArgMatches) -> bool {
Author: Dan Davison <dandavison7@gmail.com>
Date: Tue Nov 23 14:51:46 2021 -0500
DEBUG
diff --git a/src/config.rs b/src/config.rs
index efe6adb..9762222 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -400,6 +400,7 @@ fn make_blame_palette(blame_palette: Option<String>, is_light_mode: bool) -> Vec
+pub fn user_supplied_option(option: &str, arg_matches: &clap::ArgMatches) -> bool {
@@ -416,29 +433,30 @@ fn make_styles_map(opt: &cli::Opt) -> Option<HashMap<style::AnsiTermStyleEqualit
-pub fn user_supplied_option(option: &str, arg_matches: &clap::ArgMatches) -> bool {