1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00

Don't treat NUL as a combining character

This commit is contained in:
Mikael Magnusson 2015-05-10 01:55:30 +02:00
parent 949d186d6c
commit bb2362e2c0
2 changed files with 6 additions and 2 deletions

View file

@ -1,3 +1,7 @@
2015-05-10 Mikael Magnusson <mikachu@gmail.com>
* 35065: Src/zsh.h: Don't treat NUL as a combining character
2015-05-09 Daniel Shahaf <d.s@daniel.shahaf.name>
* 35066: Completion/Unix/Command/_python

View file

@ -2978,9 +2978,9 @@ typedef wint_t convchar_t;
* We can't be quite sure the wcwidth we've provided is entirely
* in agreement with the system's, so be extra safe.
*/
#define IS_COMBINING(wc) (WCWIDTH(wc) == 0 && !iswcntrl(wc))
#define IS_COMBINING(wc) (wc != 0 && WCWIDTH(wc) == 0 && !iswcntrl(wc))
#else
#define IS_COMBINING(wc) (WCWIDTH(wc) == 0)
#define IS_COMBINING(wc) (wc != 0 && WCWIDTH(wc) == 0)
#endif
/*
* Test for the base of a combining character.