trevert part of commit add0211522737b79dad990ccd65c8af63b5cc1dd - st - [fork] c… | |
git clone git://src.adamsgaard.dk/st | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 21367a040f056f6a207fafa066bd1cb2d9cae586 | |
parent b650256044f867851725f712fdac58d4ff294808 | |
Author: Hiltjo Posthuma <[email protected]> | |
Date: Fri, 15 Mar 2019 20:40:16 +0100 | |
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: | |
M config.def.h | 7 +++---- | |
M st.c | 3 +-- | |
M st.h | 2 +- | |
3 files changed, 5 insertions(+), 7 deletions(-) | |
--- | |
diff --git a/config.def.h b/config.def.h | |
t@@ -28,12 +28,11 @@ static float cwscale = 1.0; | |
static float chscale = 1.0; | |
/* | |
- * all space and punctuation characters are considered word delimiters, unless | |
- * listed here. | |
+ * word delimiter string | |
* | |
- * More advanced example: L"#$%&+,-./:=?_~" | |
+ * More advanced example: L" `'\"()[]{}" | |
*/ | |
-wchar_t *extrawordchars = L""; | |
+wchar_t *worddelimiters = L" "; | |
/* selection timeouts (in milliseconds) */ | |
static unsigned int doubleclicktimeout = 300; | |
diff --git a/st.c b/st.c | |
t@@ -16,7 +16,6 @@ | |
#include <termios.h> | |
#include <unistd.h> | |
#include <wchar.h> | |
-#include <wctype.h> | |
#include "st.h" | |
#include "win.h" | |
t@@ -42,7 +41,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) ((iswspace(u) || iswpunct(u)) && wcschr(extr… | |
+#define ISDELIM(u) (u && wcschr(worddelimiters, u)) | |
enum term_mode { | |
MODE_WRAP = 1 << 0, | |
diff --git a/st.h b/st.h | |
t@@ -114,7 +114,7 @@ char *xstrdup(char *); | |
extern char *utmp; | |
extern char *stty_args; | |
extern char *vtiden; | |
-extern wchar_t *extrawordchars; | |
+extern wchar_t *worddelimiters; | |
extern int allowaltscreen; | |
extern char *termname; | |
extern unsigned int tabspaces; |