From: Mikael Magnusson <mikachu@gmail.com>
To: zsh workers <zsh-workers@zsh.org>
Subject: PATCH: Don't treat NUL as a combining character
Date: Sat, 9 May 2015 09:46:40 +0200 [thread overview]
Message-ID: <CAHYJk3RZVupQ4EZyqAioWOYToas3bPYH=XxPQNbfA4KErUOc=Q@mail.gmail.com> (raw)
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
next reply other threads:[~2015-05-09 7:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-09 7:46 Mikael Magnusson [this message]
2015-05-10 0:02 ` Mikael Magnusson
2015-05-10 0:14 ` Bart Schaefer
2015-05-10 0:28 ` Mikael Magnusson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHYJk3RZVupQ4EZyqAioWOYToas3bPYH=XxPQNbfA4KErUOc=Q@mail.gmail.com' \
--to=mikachu@gmail.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).