mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-10 00:31:07 +02:00
Code Releases Activity

zsh-workers/8322

Browse source
This commit is contained in:
Tanaka Akira 1999-10-18 12:11:38 +00:00
parent 42510013b1
commit eb85a72ad9
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Completion/Core/_path_files
View file

@ -277,7 +277,12 @@ for prepath in "$prepaths[@]"; do
# otherwise this would keep `_files' from completing all filenames # otherwise this would keep `_files' from completing all filenames
# if none of the patterns match. # if none of the patterns match.
if [[ "$haspats" = no && -z "$tpre$tsuf" && if [[ -z "$tpre$tsuf" ]]; then
tmp1=( "$tmp2[@]" )
addsfx=(-S '')
remsfx=()
break;
elif [[ "$haspats" = no && -z "$tpre$tsuf" &&
"$pre" = */ && -z "$suf" ]]; then "$pre" = */ && -z "$suf" ]]; then
PREFIX="${opre}${osuf}" PREFIX="${opre}${osuf}"
SUFFIX="" SUFFIX=""

5
Src/Zle/zle_tricky.c
View file

@ -7835,7 +7835,7 @@ cut_cline(Cline l)
q = p; q = p;
} }
if (!e && q && !q->orig && !q->olen && (q->flags & CLF_MISS) && if (!e && q && !q->orig && !q->olen && (q->flags & CLF_MISS) &&
(q->word ? q->wlen : q->llen) < 3) { !(q->flags & CLF_MATCHED) && (q->word ? q->wlen : q->llen) < 3) {
q->word = q->line = NULL; q->word = q->line = NULL;
q->wlen = q->llen = 0; q->wlen = q->llen = 0;
} }
@ -8452,7 +8452,8 @@ do_single(Cmatch m)
if (m->flags & CMF_PARNEST) if (m->flags & CMF_PARNEST)
havesuff = 1; havesuff = 1;
} }
if ((m->flags & CMF_FILE) || (partest && isset(AUTOPARAMSLASH))) { if (((m->flags & CMF_FILE) || (partest && isset(AUTOPARAMSLASH))) &&
cs > 0 && line[cs - 1] != '/') {
/* If we have a filename or we completed a parameter name * /* If we have a filename or we completed a parameter name *
* and AUTO_PARAM_SLASH is set, lets see if it is a directory. * * and AUTO_PARAM_SLASH is set, lets see if it is a directory. *
* If it is, we append a slash. */ * If it is, we append a slash. */