1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-29 17:31:02 +01:00

zsh-3.1.6-test-1

This commit is contained in:
Tanaka Akira 1999-07-12 17:02:40 +00:00
parent 7c670f1e6a
commit 1f6786ef7a
65 changed files with 1858 additions and 505 deletions

View file

@ -307,7 +307,7 @@ getkey(int keytmout)
unsigned int ret;
long exp100ths;
int die = 0, r, icnt = 0;
int old_errno = errno;
int old_errno = errno, obreaks = breaks;
#ifdef HAVE_SELECT
fd_set foofd;
@ -397,6 +397,7 @@ getkey(int keytmout)
if (!errflag && !retflag && !breaks)
continue;
errflag = 0;
breaks = obreaks;
errno = old_errno;
return EOF;
} else if (errno == EWOULDBLOCK) {
@ -717,7 +718,7 @@ bin_vared(char *name, char **args, char *ops, int func)
Value v;
Param pm = 0;
int create = 0;
int type = PM_SCALAR;
int type = PM_SCALAR, obreaks = breaks;
char *p1 = NULL, *p2 = NULL;
if (zleactive) {
@ -809,6 +810,7 @@ bin_vared(char *name, char **args, char *ops, int func)
if (!t || errflag) {
/* error in editing */
errflag = 0;
breaks = obreaks;
return 1;
}
/* strip off trailing newline, if any */
@ -948,7 +950,7 @@ trashzle(void)
static struct builtin bintab[] = {
BUILTIN("bindkey", 0, bin_bindkey, 0, -1, 0, "evaMldDANmrsLR", NULL),
BUILTIN("vared", 0, bin_vared, 1, 7, 0, NULL, NULL),
BUILTIN("zle", 0, bin_zle, 0, -1, 0, "lDANCLmMgGcRa", NULL),
BUILTIN("zle", 0, bin_zle, 0, -1, 0, "lDANCLmMgGcRaU", NULL),
};
/* The order of the entries in this table has to match the *HOOK