mirrors
/
zsh
mirror of git://git.code.sf.net/p/zsh/code
1
0
Fork 0
Code Releases Activity

Michael Hwang: 26776: improved column alignment with print -c -P

This commit is contained in:
Peter Stephenson 2009-03-25 09:51:43 +00:00
parent 89d979e1bc
commit aa3942d2d1
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,8 @@
2009-03-25 Peter Stephenson <pws@csr.com>
* Michael Hwang: 26776: Src/builtin.c: improved column alignment
with print -c -P.
2009-03-24 Peter Stephenson <pws@csr.com>
* 26774: Src/utils.c: cd to $HOME on failure in preference to /.
@ -11482,5 +11487,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4635 $
* $Revision: 1.4636 $
*****************************************************

17
Src/builtin.c
View File

@ -3741,6 +3741,23 @@ bin_print(char *name, char **args, Options ops, int func)
memset(&mbs, 0, sizeof(mbstate_t));
while (l > 0) {
/*
* Prevent misaligned columns due to escape sequences by
* skipping over them. Octals \033 and \233 are the
* possible escape characters recognized by ANSI.
*
* It ought to be possible to do this in the case
* of prompt expansion by propagating the information
* about escape sequences (currently we strip this
* out).
*/
if (*aptr == '\033' || *aptr == '\233') {
for (aptr++, l--; l && !isalpha(*aptr); aptr++, l--);
aptr++;
l--;
continue;
}
wchar_t wc;
size_t cnt = mbrtowc(&wc, aptr, l, &mbs);
int wcw;