diff options
Diffstat (limited to 'Src/Zle')
| -rw-r--r-- | Src/Zle/zle.h | 7 | ||||
| -rw-r--r-- | Src/Zle/zle_main.c | 19 |
2 files changed, 1 insertions, 25 deletions
diff --git a/Src/Zle/zle.h b/Src/Zle/zle.h index 4b3f3f75a..fbfc02265 100644 --- a/Src/Zle/zle.h +++ b/Src/Zle/zle.h @@ -66,12 +66,7 @@ typedef wint_t ZLE_INT_T; #define ZC_iblank iswspace #define ZC_icntrl iswcntrl -/* - * TODO: doesn't work on arguments with side effects. - * Also YUK. Not even sure this is guaranteed to work. - * Should be easy to do along the lines of wcsiword. - */ -#define ZC_iident(x) (x < 256 && iident((int)x)) +#define ZC_iident wcsiident #define ZC_tolower towlower #define ZC_toupper towupper diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index 1b62ff027..923145710 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -106,11 +106,6 @@ mod_export ZLE_INT_T lastchar_wide; /**/ mod_export int lastchar_wide_valid; - -/**/ -mod_export ZLE_STRING_T zle_wordchars; -#else -# define zle_wordchars wordchars; #endif /* the bindings for the previous and for this key */ @@ -1558,17 +1553,6 @@ trashzle(void) kungetct = 0; } -/**/ -mod_export void -wordcharstrigger(void) -{ -#ifdef ZLE_UNICODE_SUPPORT - zrealloc(zle_wordchars, strlen(wordchars)*MB_CUR_MAX); - mbsrtowcs(zle_wordchars, (const char **)&wordchars, - strlen(wordchars), NULL); - /* TODO: error handling here */ -#endif -} /* Hook functions. Used to allow access to zle parameters if zle is * active. */ @@ -1636,8 +1620,6 @@ setup_(UNUSED(Module m)) kungetbuf = (char *) zalloc(kungetsz = 32); comprecursive = 0; rdstrs = NULL; - wordcharstriggerptr = wordcharstrigger; - wordcharstrigger(); /* initialise the keymap system */ init_keymaps(); @@ -1712,7 +1694,6 @@ finish_(UNUSED(Module m)) zlegetlineptr = NULL; zlereadptr = fallback_zleread; zlesetkeymapptr= noop_function_int; - wordcharstriggerptr = noop_function; getkeyptr = NULL; |