1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-11-22 13:21:27 +01:00

zsh-3.1.6-bart-7-2

This commit is contained in:
Tanaka Akira 1999-10-17 17:01:52 +00:00
parent 6014bbdb45
commit 9ffe596f25
5 changed files with 10 additions and 19 deletions

View file

@ -148,7 +148,7 @@ while [[ -n "$state" ]]; do
'*:RPM package:->package' && ret=0
;;
build_b)
tmp=( '*:spec file:_path_files -/ -g \*.spec' )
tmp=( '*:spec file:_files -g \*.spec' )
;&
build_t)
(( $#tmp )) || tmp=( '*:tar file:_files -g \*.\(\#i\)tar\(.\*\|\)' )
@ -195,7 +195,7 @@ while [[ -n "$state" ]]; do
_hosts -S/ && ret=0
else
_description expl 'RPM package file'
_path_files "$expl[@]" -/ -g '*.(#i)rpm' && ret=0
_files "$expl[@]" -g '*.(#i)rpm' && ret=0
_description expl 'ftp URL prefix'
compadd "$expl[@]" ftp://
fi

View file

@ -81,11 +81,10 @@ zsh.texi: zsh.yo
test -f $(sdir)/zsh.texi
.yo.1:
@case $@ in \
case $@ in \
*/*) target=$@ ;; \
*) target=$(sdir)/$@ ;; \
esac; \
$(YODL) -o $$target -I$(sdir) -w zman.yo version.yo $< ; \
$(YODL) -I$(sdir) -w zman.yo version.yo $< | sed -e '1s/\\-/-/g' -e '/^\.'\''/d' > $$target || exit 1; \
test -f $$target
@ -99,11 +98,10 @@ zsh_toc.html: zsh.texi
$(TEXI2HTML) $(sdir)/zsh.texi
zshall.1: zsh.yo
@case $@ in \
case $@ in \
*/*) target=$@ ;; \
*) target=$(sdir)/$@ ;; \
esac; \
echo $(YODL) -o $$target -I$(sdir) -DZSHALL -w zman.yo version.yo zsh.yo; \
$(YODL) -I$(sdir) -DZSHALL -w zman.yo version.yo zsh.yo | sed -e '1s/\\-/-/g' -e '/^\.'\''/d' > $$target || exit 1; \
test -f $$target

View file

@ -811,7 +811,7 @@ check_param(char *s, int set, int test)
*b != '=' && *b != Equals &&
*b != '~' && *b != Tilde)
break;
if (*b == '#' || *b == Pound || *b == '+' || *b == ' ')
if (*b == '#' || *b == Pound || *b == '+')
b++;
e = b;
@ -6927,20 +6927,14 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd)
if (cc->mask & (CC_JOBS | CC_RUNNING | CC_STOPPED)) {
/* Get job names. */
int i;
char *j, *jj;
char *j;
for (i = 0; i < MAXJOB; i++)
if ((jobtab[i].stat & STAT_INUSE) &&
jobtab[i].procs && jobtab[i].procs->text) {
int stopped = jobtab[i].stat & STAT_STOPPED;
j = jj = dupstring(jobtab[i].procs->text);
/* Find the first word. */
for (; *jj; jj++)
if (*jj == ' ') {
*jj = '\0';
break;
}
j = dupstring(jobtab[i].procs->text);
if ((cc->mask & CC_JOBS) ||
(stopped && (cc->mask & CC_STOPPED)) ||
(!stopped && (cc->mask & CC_RUNNING)))

View file

@ -113,8 +113,8 @@ loop(int toplevel, int justonce)
if (!(list = parse_event())) { /* if we couldn't parse a list */
hend();
if ((tok == ENDINPUT && !errflag) ||
(tok == LEXERR && (!noerrexit || emulation == EMULATE_KSH)
&& (!isset(SHINSTDIN) || !toplevel)) || justonce)
(tok == LEXERR && (!isset(SHINSTDIN) || !toplevel)) ||
justonce)
break;
continue;
}

View file

@ -87,8 +87,7 @@ main(int argc, char **argv)
for (;;) {
do
loop(1,0);
while (tok != ENDINPUT &&
(tok != LEXERR || noerrexit || isset(SHINSTDIN)));
while (tok != ENDINPUT && (tok != LEXERR || isset(SHINSTDIN)));
if (tok == LEXERR) {
stopmsg = 1;
zexit(lastval, 0);