Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
PATCH: Don't treat NUL as a combining character
- X-seq: zsh-workers 35065
- From: Mikael Magnusson <mikachu@xxxxxxxxx>
- To: zsh workers <zsh-workers@xxxxxxx>
- Subject: PATCH: Don't treat NUL as a combining character
- Date: Sat, 9 May 2015 09:46:40 +0200
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=AzlYuONuET+O0J/rynq++ZQkUQmvpaXj45qyki99BhQ=; b=YUHP/fjw4CRszo8XGTAar4vwHDJE4oNmv2mh8IhoybE4pfkKS+TgfUS4CsbtLnIz5+ CBp2vhqLa9sBxpv7y6RlB0AmouVLk9z9gamPmUM+NKZLxrHe3Amh5lvNRhmrd68Vf3Lj H/WQMCBVmILfXIINRdtu0PBQiGTS/7dK0WnHGmFEwOGXdxXUYtnNRz1ySwF/GCap3gOM yRhjLTF2YL/CYFxb4Uk2RWKXyG/u9GLWvBSacqxvLRusqWuaG8JooyPkPNRTlLma7Uri xTFgUrYjvGNt8Ttd8LhGNl+EMZ3CT1ucqE6xHU+8V5iyDU4ePu3yuTIb5Mfau+omAk2B +rIQ==
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
As title, if you input
% something<ctrl-v ctrl-space>
while combining_chars is set, it visually doesn't appear, but toggling
the option makes it appear again (just like for actual combining
characters).
(I was momentarily confused why a command looking like *.mp4(e'fattr
notes test') worked, then i remembered my ^_e bind to enter an e::
glob uses ^@ as the separator. Normally I don't have combining_chars
set, but this directory contains some NFD files.)
I considered using L'\0' to clarify the intent, but I have no idea if
all compilers support wchar literals?
index 6b3cb97..13c053c 100644
--- i/Src/zsh.h
+++ w/Src/zsh.h
@@ -2982,9 +2982,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.
--
Mikael Magnusson
Messages sorted by:
Reverse Date,
Date,
Thread,
Author