diff options
author | Hiltjo Posthuma <hiltjo@codemadness.org> | 2019-03-15 20:40:16 +0100 |
---|---|---|
committer | Hiltjo Posthuma <hiltjo@codemadness.org> | 2019-03-15 20:40:16 +0100 |
commit | 21367a040f056f6a207fafa066bd1cb2d9cae586 (patch) | |
tree | 3e9e0e5802475c69d1c81c35a38b48561b7016d4 /st.c | |
parent | b650256044f867851725f712fdac58d4ff294808 (diff) | |
download | st-patched-21367a040f056f6a207fafa066bd1cb2d9cae586.tar.bz2 st-patched-21367a040f056f6a207fafa066bd1cb2d9cae586.tar.xz st-patched-21367a040f056f6a207fafa066bd1cb2d9cae586.zip |
revert part of commit add0211522737b79dad990ccd65c8af63b5cc1dd
"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."
Feedback from IRC and personal preference.
Diffstat (limited to 'st.c')
-rw-r--r-- | st.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -16,7 +16,6 @@ | |||
16 | #include <termios.h> | 16 | #include <termios.h> |
17 | #include <unistd.h> | 17 | #include <unistd.h> |
18 | #include <wchar.h> | 18 | #include <wchar.h> |
19 | #include <wctype.h> | ||
20 | 19 | ||
21 | #include "st.h" | 20 | #include "st.h" |
22 | #include "win.h" | 21 | #include "win.h" |
@@ -42,7 +41,7 @@ | |||
42 | #define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177') | 41 | #define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177') |
43 | #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) | 42 | #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) |
44 | #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) | 43 | #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) |
45 | #define ISDELIM(u) ((iswspace(u) || iswpunct(u)) && wcschr(extrawordchars, u) == NULL) | 44 | #define ISDELIM(u) (u && wcschr(worddelimiters, u)) |
46 | 45 | ||
47 | enum term_mode { | 46 | enum term_mode { |
48 | MODE_WRAP = 1 << 0, | 47 | MODE_WRAP = 1 << 0, |