fish.cpp (fish-3.5.0.tar.xz) | : | fish.cpp (fish-3.5.1.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 551 | skipping to change at line 551 | |||
parser.clear_profiling(); | parser.clear_profiling(); | |||
} | } | |||
g_profiling_active = !opts.profile_output.empty(); | g_profiling_active = !opts.profile_output.empty(); | |||
// Run post-config commands specified as arguments, if any. | // Run post-config commands specified as arguments, if any. | |||
if (!opts.postconfig_cmds.empty()) { | if (!opts.postconfig_cmds.empty()) { | |||
res = run_command_list(parser, &opts.postconfig_cmds, {}); | res = run_command_list(parser, &opts.postconfig_cmds, {}); | |||
} | } | |||
// Clear signals in case we were interrupted (#9024). | ||||
signal_clear_cancel(); | ||||
if (!opts.batch_cmds.empty()) { | if (!opts.batch_cmds.empty()) { | |||
// Run the commands specified as arguments, if any. | // Run the commands specified as arguments, if any. | |||
if (get_login()) { | if (get_login()) { | |||
// Do something nasty to support OpenSUSE assuming we're bash. This may modify cmds. | // Do something nasty to support OpenSUSE assuming we're bash. This may modify cmds. | |||
fish_xdm_login_hack_hack_hack_hack(&opts.batch_cmds, argc - my_optin d, | fish_xdm_login_hack_hack_hack_hack(&opts.batch_cmds, argc - my_optin d, | |||
argv + my_optind); | argv + my_optind); | |||
} | } | |||
// Pass additional args as $argv. | // Pass additional args as $argv. | |||
// Note that we *don't* support setting argv[0]/$0, unlike e.g. bash. | // Note that we *don't* support setting argv[0]/$0, unlike e.g. bash. | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 3 lines changed or added |