I noticed that my patch wasn't handling backslash-quoted whitespace, so I fixed that. I then did some testing of filename-matching, and noticed an improvement: % emulate sh % touch '1 2' '3 4' % print -l ${1:-*[\ ]*} 1 2 3 4 Unpatched zsh would have output "*[" and "]*" on separate lines, which is the behavior that happens without the backslash (in bash and both patched/unpatched zsh). One inconsistency with bash is the handling of '~' -- we no longer split it if it contains a space, but bash does. I think I'll just leave this alone for now. I added a few more tests to the D04 file. Attached is the latest version of the patch. ..wayne..