aboutsummaryrefslogtreecommitdiff
path: root/st.c
diff options
context:
space:
mode:
authorLauri Tirkkonen <lotheac@iki.fi>2019-03-13 17:15:04 +0200
committerHiltjo Posthuma <hiltjo@codemadness.org>2019-03-15 12:25:13 +0100
commitadd0211522737b79dad990ccd65c8af63b5cc1dd (patch)
treea64838abc0734a24b86229e610a339ef7cd35783 /st.c
parentd5efd256aa3840476579a27293ef1fb92a4b51e7 (diff)
downloadst-add0211522737b79dad990ccd65c8af63b5cc1dd.tar.gz
st-add0211522737b79dad990ccd65c8af63b5cc1dd.tar.bz2
st-add0211522737b79dad990ccd65c8af63b5cc1dd.zip
use iswspace()/iswpunct() to find word delimiters
this inverts the configuration logic: you no longer provide a list of delimiters -- all space and punctuation characters are considered delimiters, unless listed in extrawordchars.
Diffstat (limited to 'st.c')
-rw-r--r--st.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/st.c b/st.c
index 812f30c..c383b43 100644
--- a/st.c
+++ b/st.c
@@ -16,6 +16,7 @@
#include <termios.h>
#include <unistd.h>
#include <wchar.h>
+#include <wctype.h>
#include "st.h"
#include "win.h"
@@ -41,7 +42,7 @@
#define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177')
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
-#define ISDELIM(u) (u != 0 && wcschr(worddelimiters, u) != NULL)
+#define ISDELIM(u) ((iswspace(u) || iswpunct(u)) && wcschr(extrawordchars, u) == NULL)
enum term_mode {
MODE_WRAP = 1 << 0,