Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 13:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix spelling: s/circut/circuit/g

Browse source
This commit is contained in:
Cheer Xiao 2013-01-24 19:17:55 +08:00
parent 2ea1c2be92
commit 8f045b9ec5
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
exec.cpp
View file

@ -1165,7 +1165,7 @@ void exec(parser_t &parser, job_t *j)
p->completed=1; p->completed=1;
if (p->next == 0) if (p->next == 0)
{ {
debug(3, L"Set status of %ls to %d using short circut", j->command_wcstr(), p->status); debug(3, L"Set status of %ls to %d using short circuit", j->command_wcstr(), p->status);
int status = p->status; int status = p->status;
proc_set_last_status(job_get_flag(j, JOB_NEGATE)?(!status):status); proc_set_last_status(job_get_flag(j, JOB_NEGATE)?(!status):status);

2
exec.h
View file

@ -31,7 +31,7 @@
output of the builtin. This is surprisingly cheap on my computer, output of the builtin. This is surprisingly cheap on my computer,
probably because of the marvels of copy on write forking. probably because of the marvels of copy on write forking.
This rule is short circuted in the case where a builtin does not This rule is short circuited in the case where a builtin does not
output to a pipe and does in fact not output anything. The speed output to a pipe and does in fact not output anything. The speed
improvement from this optimization is not noticable on a normal improvement from this optimization is not noticable on a normal
computer/OS in regular use, but the promiscous amounts of forking computer/OS in regular use, but the promiscous amounts of forking

2
expand.cpp
View file

@ -1655,7 +1655,7 @@ int expand_string(const wcstring &input, std::vector<completion_t> &output, expa
/* /*
If process expansion matches, we are not If process expansion matches, we are not
interested in other completions, so we interested in other completions, so we
short-circut and return short-circuit and return
*/ */
if (!(flags & EXPAND_SKIP_PROCESS)) if (!(flags & EXPAND_SKIP_PROCESS))
expand_pid(next, flags, output); expand_pid(next, flags, output);

2
proc.cpp
View file

@ -1188,7 +1188,7 @@ void job_continue(job_t *j, int cont)
{ {
/* /*
Mark process status only if we are in the foreground Mark process status only if we are in the foreground
and the last process in a pipe, and it is not a short circuted builtin and the last process in a pipe, and it is not a short circuited builtin
*/ */
if (p->pid) if (p->pid)
{ {

2
proc.h
View file

@ -252,7 +252,7 @@ enum
/** This flag is set to one on wildcard expansion errors. It means that the current command should not be executed */ /** This flag is set to one on wildcard expansion errors. It means that the current command should not be executed */
JOB_WILDCARD_ERROR = 1 << 6, JOB_WILDCARD_ERROR = 1 << 6,
/** Skip executing this job. This flag is set by the short-circut builtins, i.e. and and or */ /** Skip executing this job. This flag is set by the short-circuit builtins, i.e. and and or */
JOB_SKIP = 1 << 7, JOB_SKIP = 1 << 7,
/** Whether the job is under job control */ /** Whether the job is under job control */