commit 6d38ca41f98d5229f09aa7158ab9c7887554d08b
parent e7fbb3e5c135a042efb6c22c7659e322aa78dc4e
Author: Cem Keylan <cem@ckyln.com>
Date: Tue, 12 Nov 2019 05:58:57 +0300
revert part of previous commit
Diffstat:
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/config.h b/config.h
@@ -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
@@ -16,7 +16,6 @@
#include <termios.h>
#include <unistd.h>
#include <wchar.h>
-#include <wctype.h>
#include "st.h"
#include "win.h"
@@ -43,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) ((iswspace(u) || iswpunct(u)) && wcschr(extrawordchars, u) == NULL)
+#define ISDELIM(u) (u && wcschr(worddelimiters, u))
#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
term.scr + HISTSIZE + 1) % HISTSIZE] : \
term.line[(y) - term.scr])
diff --git a/st.h b/st.h
@@ -117,7 +117,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;