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

Fix formatting

Browse source
This commit is contained in:
ridiculousfish 2013-10-26 15:27:39 -07:00
parent 03c65d7a96
commit cf766b55cc
20 changed files with 94 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin.cpp
View file

@ -1634,7 +1634,7 @@ static int builtin_echo(parser_t &parser, wchar_t **argv)
}
else
{
invalid_echo_option:
invalid_echo_option:
break;
}
argv++;

2
complete.cpp
View file

@ -1627,7 +1627,7 @@ void completer_t::complete_param_expand(const wcstring &sstr, bool do_file)
if (expand_string(comp_str,
this->completions,
flags ) == EXPAND_ERROR)
flags) == EXPAND_ERROR)
{
debug(3, L"Error while expanding string '%ls'", comp_str);
}

7
fish.cpp
View file

@ -366,9 +366,12 @@ static int fish_parse_opt(int argc, char **argv, std::vector<std::string> *out_c
is_login |= (strcmp(argv[0], "-fish") == 0);
/* We are an interactive session if we are either forced, or have not been given an explicit command to execute and stdin is a tty. */
if (force_interactive) {
if (force_interactive)
{
is_interactive_session = true;
} else if (is_interactive_session) {
}
else if (is_interactive_session)
{
is_interactive_session = ! has_cmd && (my_optind == argc) && isatty(STDIN_FILENO);
}

2
parser.cpp
View file

@ -2049,7 +2049,7 @@ int parser_t::parse_job(process_t *p,
/* Looks like a command */
debug(0,
_( L"Unknown command '%ls'. Did you mean to run %ls with a modified environment? Try 'env %ls=%ls %ls%ls'. See the help section on the set command by typing 'help set'."),
_(L"Unknown command '%ls'. Did you mean to run %ls with a modified environment? Try 'env %ls=%ls %ls%ls'. See the help section on the set command by typing 'help set'."),
cmd,
next_str.c_str(),
name_str.c_str(),

5
proc.h
View file

@ -373,7 +373,10 @@ public:
unsigned int flags;
/* Returns the block IO redirections associated with the job. These are things like the IO redirections associated with the begin...end statement. */
const io_chain_t &block_io_chain() const { return this->block_io; }
const io_chain_t &block_io_chain() const
{
return this->block_io;
}
/* Fetch all the IO redirections associated with the job */
io_chain_t all_io_redirections() const;

4
reader.cpp
View file

@ -984,9 +984,9 @@ void reader_init()
// PCA disable VDSUSP (typically control-Y), which is a funny job control
// function available only on OS X and BSD systems
// This lets us use control-Y for yank instead
#ifdef VDSUSP
#ifdef VDSUSP
shell_modes.c_cc[VDSUSP] = _POSIX_VDISABLE;
#endif
#endif
#endif
}