Skip to content

Commit

Permalink
revert part of commit add0211
Browse files Browse the repository at this point in the history
"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.
  • Loading branch information
hiltjo committed Mar 15, 2019
1 parent b650256 commit 21367a0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
7 changes: 3 additions & 4 deletions config.def.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions st.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <termios.h>
#include <unistd.h>
#include <wchar.h>
#include <wctype.h>

#include "st.h"
#include "win.h"
Expand All @@ -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(extrawordchars, u) == NULL)
#define ISDELIM(u) (u && wcschr(worddelimiters, u))

enum term_mode {
MODE_WRAP = 1 << 0,
Expand Down
2 changes: 1 addition & 1 deletion st.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 21367a0

Please sign in to comment.