st-flexipatch

commit 87c1d1e59894024bfa22aa82cfe405292bc77271
parent d8b8f94d64a48c345e8979f6eb6fd5e3db642ceb
Author: bakkeby <bakkeby@gmail.com>
Date:   Tue, 24 Mar 2020 13:51:45 +0100

revert part of commit add0211522737b79dad990ccd65c8af63b5cc1dd (cae586)

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
@@ -42,12 +42,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
@@ -16,7 +16,6 @@
 #include <termios.h>
 #include <unistd.h>
 #include <wchar.h>
-#include <wctype.h>
 
 #include "st.h"
 #include "win.h"
@@ -50,7 +49,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(extrawordchars, u) == NULL)
+#define ISDELIM(u)		(u && wcschr(worddelimiters, u))
 
 enum term_mode {
 	MODE_WRAP        = 1 << 0,
diff --git a/st.h b/st.h
@@ -133,7 +133,7 @@ int borderpx;
 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;