diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-06-19 10:48:21 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-06-19 10:48:21 +0000 |
| commit | 083befef2bfe9a93dbf6a6acfe2faed7f743d6ed (patch) | |
| tree | 4505f9d3a1411446c51f7144252966f4fe5667d4 /Src/Zle/compmatch.c | |
| parent | a295e82c1e3c6d10cd873d0fcd31ed45d77e4ca3 (diff) | |
| download | zsh-083befef2bfe9a93dbf6a6acfe2faed7f743d6ed.tar.gz zsh-083befef2bfe9a93dbf6a6acfe2faed7f743d6ed.zip | |
new match spec characters bBeE, match only word/line not both (11977)
Diffstat (limited to 'Src/Zle/compmatch.c')
| -rw-r--r-- | Src/Zle/compmatch.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c index 130cb23b0..aa7890407 100644 --- a/Src/Zle/compmatch.c +++ b/Src/Zle/compmatch.c @@ -565,7 +565,9 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, NULL, NULL)) || !match_parts(l + aoff, w + aoff, alen, part)))) continue; - } else if (!both || il || iw) + } else if (!both || ((mp->flags & CMF_INTER) ? + ((mp->flags & CMF_LINE) ? iw : il) : + (il || iw))) continue; /* Fine, now we call ourselves recursively to find the @@ -734,7 +736,9 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, tw - mp->lalen - mp->ralen, NULL, NULL)); else - t = (!sfx && !il && !iw); + t = (!sfx && !((mp->flags & CMF_INTER) ? + ((mp->flags & CMF_LINE) ? iw : il) : + (il || iw))); } if (mp->flags & CMF_RIGHT) { /* Try to match the right anchor, if any. */ @@ -753,7 +757,9 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, mp->ralen - mp->lalen, NULL, NULL)); else - t = (sfx && !il && !iw); + t = (sfx && !((mp->flags & CMF_INTER) ? + ((mp->flags & CMF_LINE) ? iw : il) : + (il || iw))); } /* Now try to match the line and word patterns. */ if (!t || |