From 8fd378c09636e3c9a2275dcd1b9195a21a38e5de Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Sat, 25 Jul 2020 10:24:09 -0400
Subject: Moved word highlighting back into editing module and disable by
 default. Also fixed `HIGHLIGHT_SELECTED` behavior with non-word selections.

---
 themes/dark.lua  | 4 ++--
 themes/light.lua | 7 +++----
 themes/term.lua  | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'themes')

diff --git a/themes/dark.lua b/themes/dark.lua
index 4d5d2087..d147a4d7 100644
--- a/themes/dark.lua
+++ b/themes/dark.lua
@@ -118,11 +118,11 @@ for i = buffer.MARKNUM_FOLDEREND, buffer.MARKNUM_FOLDEROPEN do -- fold margin
 end
 
 -- Indicators.
-view.indic_fore[ui.INDIC_HIGHLIGHT] = colors.grey
-view.indic_alpha[ui.INDIC_HIGHLIGHT] = 128
 view.indic_fore[ui.find.INDIC_FIND] = colors.dark_yellow
 view.indic_alpha[ui.find.INDIC_FIND] = 255
 view.indic_fore[textadept.editing.INDIC_BRACEMATCH] = colors.light_grey
+view.indic_fore[textadept.editing.INDIC_HIGHLIGHT] = colors.orange
+view.indic_alpha[textadept.editing.INDIC_HIGHLIGHT] = 128
 view.indic_fore[textadept.snippets.INDIC_PLACEHOLDER] = colors.grey
 
 -- Call tips.
diff --git a/themes/light.lua b/themes/light.lua
index 70afaf9b..89be42c0 100644
--- a/themes/light.lua
+++ b/themes/light.lua
@@ -118,13 +118,12 @@ for i = buffer.MARKNUM_FOLDEREND, buffer.MARKNUM_FOLDEROPEN do -- fold margin
 end
 
 -- Indicators.
-view.indic_fore[ui.INDIC_HIGHLIGHT] = colors.light_grey
-view.indic_alpha[ui.INDIC_HIGHLIGHT] = 128
 view.indic_fore[ui.find.INDIC_FIND] = colors.yellow
 view.indic_alpha[ui.find.INDIC_FIND] = 255
 view.indic_fore[textadept.editing.INDIC_BRACEMATCH] = colors.grey
-local INDIC_PLACEHOLDER = textadept.snippets.INDIC_PLACEHOLDER
-view.indic_fore[INDIC_PLACEHOLDER] = colors.grey_black
+view.indic_fore[textadept.editing.INDIC_HIGHLIGHT] = colors.orange
+view.indic_alpha[textadept.editing.INDIC_HIGHLIGHT] = 128
+view.indic_fore[textadept.snippets.INDIC_PLACEHOLDER] = colors.grey_black
 
 -- Call tips.
 view.call_tip_fore_hlt = colors.light_blue
diff --git a/themes/term.lua b/themes/term.lua
index d9c67c78..ec2fd53a 100644
--- a/themes/term.lua
+++ b/themes/term.lua
@@ -75,8 +75,8 @@ view.marker_back[textadept.run.MARK_WARNING] = colors.yellow
 view.marker_back[textadept.run.MARK_ERROR] = colors.red
 
 -- Indicators.
-view.indic_fore[ui.INDIC_HIGHLIGHT] = colors.yellow
 view.indic_fore[ui.find.INDIC_FIND] = colors.yellow
+view.indic_fore[textadept.editing.INDIC_HIGHLIGHT] = colors.yellow
 view.indic_fore[textadept.snippets.INDIC_PLACEHOLDER] = colors.magenta
 
 -- Call tips.
-- 
cgit v1.2.3