diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2011-09-18 17:44:12 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2011-09-18 17:44:12 +0000 |
| commit | 84f8330e0dc88d4115b367432fd7b430eb332c8e (patch) | |
| tree | 5a2282b662c4d7f9116ac4f44065531bf4682de6 | |
| parent | 1c2ff6852911c47b1386d72e781b465f140e77eb (diff) | |
| download | zsh-84f8330e0dc88d4115b367432fd7b430eb332c8e.tar.gz zsh-84f8330e0dc88d4115b367432fd7b430eb332c8e.tar.xz zsh-84f8330e0dc88d4115b367432fd7b430eb332c8e.zip | |
users/16375: initialise nrefs on each loop in match tests
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Src/Zle/complist.c | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index c3b589bf7..4e69f9654 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-09-18 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * users/16375: Src/Zle/complist.c: initialise number of + references each time for multiple match tests when + highlighting. + 2011-09-16 Mikael Magnusson <mikachu@gmail.com> * 29764, 29765: Completion/Unix/Command/_pgrep: use _users and @@ -15424,5 +15430,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5468 $ +* $Revision: 1.5469 $ ***************************************************** diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index c9c0c2dd4..bcf356179 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -849,9 +849,9 @@ putmatchcol(char *group, char *n) { Patcol pc; - nrefs = MAX_POS - 1; + for (pc = mcolors.pats; pc; pc = pc->next) { + nrefs = MAX_POS - 1; - for (pc = mcolors.pats; pc; pc = pc->next) if ((!pc->prog || !group || pattry(pc->prog, group)) && pattryrefs(pc->pat, n, -1, -1, 0, &nrefs, begpos, endpos)) { if (pc->cols[1]) { @@ -863,6 +863,7 @@ putmatchcol(char *group, char *n) return 0; } + } zcputs(group, COL_NO); @@ -880,9 +881,9 @@ putfilecol(char *group, char *filename, mode_t m, int special) Patcol pc; int len; - nrefs = MAX_POS - 1; + for (pc = mcolors.pats; pc; pc = pc->next) { + nrefs = MAX_POS - 1; - for (pc = mcolors.pats; pc; pc = pc->next) if ((!pc->prog || !group || pattry(pc->prog, group)) && pattryrefs(pc->pat, filename, -1, -1, 0, &nrefs, begpos, endpos)) { if (pc->cols[1]) { @@ -894,6 +895,7 @@ putfilecol(char *group, char *filename, mode_t m, int special) return 0; } + } if (special != -1) { colour = special; |