From f41d78083aa8d3883bcd4ed819e6784e09e69dba Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Mon, 26 Jun 2017 15:28:41 +0100
Subject: Use the extra_word_chars option in word based normal commands

the completion_extra_word_chars is now gone, superseeded by
extra_word_chars that gets used both for completion and for normal mode.

Fixes #1304
---
 src/insert_completer.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/insert_completer.cc')

diff --git a/src/insert_completer.cc b/src/insert_completer.cc
index dd259756..087dd00a 100644
--- a/src/insert_completer.cc
+++ b/src/insert_completer.cc
@@ -79,8 +79,8 @@ WordDB& get_word_db(const Buffer& buffer)
 template<bool other_buffers>
 InsertCompletion complete_word(const SelectionList& sels, const OptionManager& options)
 {
-    auto& extra_word_char = options["completion_extra_word_char"].get<Vector<Codepoint, MemoryDomain::Options>>();
-    auto is_word_pred = [extra_word_char](Codepoint c) { return is_word(c) or contains(extra_word_char, c); };
+    ConstArrayView<Codepoint> extra_word_chars = options["extra_word_chars"].get<Vector<Codepoint, MemoryDomain::Options>>();
+    auto is_word_pred = [extra_word_chars](Codepoint c) { return is_word(c, extra_word_chars); };
 
     const Buffer& buffer = sels.buffer();
     BufferCoord cursor_pos = sels.main().cursor();
-- 
cgit v1.2.3