diff options
author | Bart Schaefer <barts@users.sourceforge.net> | 2001-11-03 23:35:25 +0000 |
---|---|---|
committer | Bart Schaefer <barts@users.sourceforge.net> | 2001-11-03 23:35:25 +0000 |
commit | 7f1ce57089409f98a0f13ce2eed5b56152219455 (patch) | |
tree | 13c480aa7bc7c706d85474ed513e510ccd58e255 | |
parent | be640ed5877ed88ddc9343e7c87816b3c24067f1 (diff) | |
download | zsh-7f1ce57089409f98a0f13ce2eed5b56152219455.tar.gz zsh-7f1ce57089409f98a0f13ce2eed5b56152219455.tar.xz zsh-7f1ce57089409f98a0f13ce2eed5b56152219455.zip |
16158: interpret TAB as "yes" only in spckword()
16201: introduce the PM_NAMEDDIR flag
-rw-r--r-- | Src/utils.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Src/utils.c b/Src/utils.c index d7d277b55..8779d25dc 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -571,6 +571,7 @@ getnameddir(char *name) if ((pm = (Param) paramtab->getnode(paramtab, name)) && (PM_TYPE(pm->flags) == PM_SCALAR) && (str = getsparam(name)) && *str == '/') { + pm->flags |= PM_NAMEDDIR; adduserdir(name, str, 0, 1); return str; } @@ -1477,7 +1478,7 @@ getquery(char *valid_chars, int purge) } while ((c = read1char()) >= 0) { - if (c == 'Y' || c == '\t') + if (c == 'Y') c = 'y'; else if (c == 'N') c = 'n'; @@ -1641,11 +1642,11 @@ spckword(char **s, int hist, int cmd, int ask) free(pptbuf); fflush(shout); zbeep(); - x = getquery("nyae ", 0); + x = getquery("nyae \t", 0); } } else x = 'y'; - if (x == 'y' || x == ' ') { + if (x == 'y' || x == ' ' || x == '\t') { *s = dupstring(best); if (hist) hwrep(best); |