Skip to content

Commit a61b105

Browse files
Freed-WuOliver Kiddle
authored and
Oliver Kiddle
committed
github #126: Fix some typos
1 parent 9f9ceb7 commit a61b105

File tree

8 files changed

+13
-9
lines changed

8 files changed

+13
-9
lines changed

ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
2025-01-27 Oliver Kiddle <[email protected]>
22

3+
* github #126: Wu, Zhenyu: Completion/Base/Completer/_expand_alias,
4+
Src/exec.c, Src/init.c, Src/parse.c, Src/utils.c, Src/zsh.h,
5+
configure.ac: Fix some typos
6+
37
* github #125: Kouhei Yanagita: Completion/Unix/Command/_ruby:
48
Add completion for irb --no-pager
59

Completion/Base/Completer/_expand_alias

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if [[ -n $tmp ]]; then
4949
if [[ $tmpa[1] = $word && $tmp = $aliases[$word] ]]; then
5050
# This is an active regular alias and the first word in the result
5151
# is the same as what was on the line already. Quote it so
52-
# that it doesn't get reexanded on execution.
52+
# that it doesn't get reexpanded on execution.
5353
#
5454
# Strictly we also need to check if the original word matches
5555
# a later word in the expansion and the previous words are

Src/exec.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1386,7 +1386,7 @@ execlist(Estate state, int dont_change_job, int exiting)
13861386
*list_pipe_text = '\0';
13871387
}
13881388

1389-
/* Loop over all sets of comands separated by newline, *
1389+
/* Loop over all sets of commands separated by newline, *
13901390
* semi-colon or ampersand (`sublists'). */
13911391
code = *state->pc++;
13921392
if (wc_code(code) != WC_LIST) {
@@ -3033,7 +3033,7 @@ execcmd_exec(Estate state, Execcmd_params eparams,
30333033
/*
30343034
* preargs contains args that have been expanded by prefork.
30353035
* Running execcmd_getargs() causes any argument available
3036-
* in args to be exanded where necessary and transferred to
3036+
* in args to be expanded where necessary and transferred to
30373037
* preargs. We call execcmd_getargs() every time we need to
30383038
* analyse an argument not available in preargs, though there is
30393039
* no guarantee a further argument will be available.

Src/init.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@ setupvals(char *cmd, char *runscript, char *zsh_name)
12821282
adjustwinsize(0);
12831283
#else
12841284
/* columns and lines are normally zero, unless something different *
1285-
* was inhereted from the environment. If either of them are zero *
1285+
* was inherited from the environment. If either of them are zero *
12861286
* the setiparam calls below set them to the defaults from termcap */
12871287
setiparam("COLUMNS", zterm_columns);
12881288
setiparam("LINES", zterm_lines);

Src/parse.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ init_parse_status(void)
490490
/*
491491
* These variables are currently declared by the parser, so we
492492
* initialise them here. Possibly they are more naturally declared
493-
* by the lexical anaylser; however, as they are used for signalling
493+
* by the lexical analyser; however, as they are used for signalling
494494
* between the two it's a bit ambiguous. We clear them when
495495
* using the lexical analyser for strings as well as here.
496496
*/

Src/utils.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2059,7 +2059,7 @@ redup(int x, int y)
20592059
* Add an fd opened ithin a module.
20602060
*
20612061
* fdt is the type of the fd; see the FDT_ definitions in zsh.h.
2062-
* The most likely falures are:
2062+
* The most likely failures are:
20632063
*
20642064
* FDT_EXTERNAL: the fd can be used within the shell for normal I/O but
20652065
* it will not be closed automatically or by normal shell syntax.

Src/zsh.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1667,7 +1667,7 @@ enum zpc_chars {
16671667
ZPC_KSH_BANG, /* ! for !(...) in KSH_GLOB */
16681668
ZPC_KSH_BANG2, /* ! for !(...) in KSH_GLOB, untokenised */
16691669
ZPC_KSH_AT, /* @ for @(...) in KSH_GLOB */
1670-
ZPC_COUNT /* Number of special chararacters */
1670+
ZPC_COUNT /* Number of special characters */
16711671
};
16721672

16731673
/*

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -1342,7 +1342,7 @@ dnl Check if tgetent accepts NULL (and will allocate its own termcap buffer)
13421342
dnl Some termcaps reportedly accept a zero buffer, but then dump core
13431343
dnl in tgetstr().
13441344
dnl Under Cygwin test program crashes but exit code is still 0. So,
1345-
dnl we test for a file that porgram should create
1345+
dnl we test for a file that program should create
13461346
AH_TEMPLATE([TGETENT_ACCEPTS_NULL],
13471347
[Define to 1 if tgetent() accepts NULL as a buffer.])
13481348
AC_CACHE_CHECK(if tgetent accepts NULL,
@@ -1495,7 +1495,7 @@ $AWK '{ if ($1 ~ /sig/) files[[$1]] = $1 }
14951495
END { for (var in files) print var }'`"
14961496
rm -f nametmp.c
14971497
if test -z "$sigfile_list"; then
1498-
dnl In case we don't get the stuff from the preprocesor, use the old
1498+
dnl In case we don't get the stuff from the preprocessor, use the old
14991499
dnl list of standard places.
15001500
sigfile_list="/usr/include/sys/iso/signal_iso.h
15011501
/usr/include/bsd/sys/signal.h

0 commit comments

Comments
 (0)