diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-26 15:27:39 -0700 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-10-26 15:27:39 -0700 |
commit | cf766b55cca979745f6c218d78f9cdcc297b3f20 (patch) | |
tree | d5c31f6aaa56aaa4ac7c967c91d6e822d0f8d27d /fish.cpp | |
parent | 03c65d7a96c9cadc9feff339ca0af7f43eb7391e (diff) |
Fix formatting
Diffstat (limited to 'fish.cpp')
-rw-r--r-- | fish.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -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); } @@ -402,7 +405,7 @@ int main(int argc, char **argv) debug(1, _(L"Can not use the no-execute mode when running an interactive session")); no_exec = 0; } - + /* Only save (and therefore restore) the fg process group if we are interactive. See #197, #1002 */ if (is_interactive_session) { @@ -509,7 +512,7 @@ int main(int argc, char **argv) } proc_fire_event(L"PROCESS_EXIT", EVENT_EXIT, getpid(), res); - + restore_term_mode(); restore_term_foreground_process_group(); history_destroy(); |