aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-01-26 19:26:34 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-01-26 19:26:34 +0000
commit2310ffd1b86ffc349a468a2834d6c4307e52809d (patch)
tree62c30e4d0ef52302a0d49aedb0933ad33abe4947
parentMerge branch 'search-match-multi-column-chars-2' (diff)
search: match composed characters when extending the search string to the next word boundary
-rw-r--r--search.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/search.c b/search.c
index 02dfc36a..0391c281 100644
--- a/search.c
+++ b/search.c
@@ -473,6 +473,14 @@ search_match_to_end_of_word(struct terminal *term, bool spaces_only)
if (wc == CELL_MULT_COL_SPACER)
continue;
+ const struct composed *composed = NULL;
+ if (wc >= CELL_COMB_CHARS_LO &&
+ wc < (CELL_COMB_CHARS_LO + term->composed_count))
+ {
+ composed = &term->composed[wc - CELL_COMB_CHARS_LO];
+ wc = composed->base;
+ }
+
if (wc == 0 || (!first && !isword(wc, spaces_only, term->conf->word_delimiters))) {
done = true;
break;
@@ -480,6 +488,11 @@ search_match_to_end_of_word(struct terminal *term, bool spaces_only)
first = false;
tll_push_back(new_chars, wc);
+
+ if (composed != NULL) {
+ for (size_t i = 0; i < composed->count; i++)
+ tll_push_back(new_chars, composed->combining[i]);
+ }
}
if (done)