From 1abdb0fe2b3936d7f4db9fa645583c7f1a6e967e Mon Sep 17 00:00:00 2001 From: "Michael D. Lowis" Date: Mon, 19 Dec 2016 16:08:34 -0500 Subject: [PATCH] reverted changes to risword. Instead broke out the extra symbols into separate functions for use based on context --- inc/utf.h | 3 +++ libedit/utf8.c | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/inc/utf.h b/inc/utf.h index 1a81753..7b361a4 100644 --- a/inc/utf.h +++ b/inc/utf.h @@ -18,4 +18,7 @@ int runewidth(unsigned col, Rune r); size_t rstrlen(Rune* runes); Rune* charstorunes(char* str); bool risword(Rune r); +bool rissigil(Rune r); +bool risfile(Rune r); +bool riscmd(Rune r); bool risblank(Rune r); diff --git a/libedit/utf8.c b/libedit/utf8.c index 42ed72d..40d86d7 100644 --- a/libedit/utf8.c +++ b/libedit/utf8.c @@ -140,9 +140,19 @@ Rune* charstorunes(char* str) { } bool risword(Rune r) { - return (r < 127 && (isalnum(r) || r == '_' || r == ':' || r == '!' || - r == '|' || r == '>' || r == '<' || r == '/' || - r == '.')); + return (r < 127 && (isalnum(r) || r == '_')); +} + +bool rissigil(Rune r) { + return (r == ':' || r == '!' || r == '|' || r == '>' || r == '<'); +} + +bool risfile(Rune r) { + return (risword(r) || r == '/' || r == '.'); +} + +bool riscmd(Rune r) { + return (risword(r) || rissigil(r)); } bool risblank(Rune r) { -- 2.54.0