diff options
| -rw-r--r-- | etc/config.fish | 4 | ||||
| -rw-r--r-- | fish.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/etc/config.fish b/etc/config.fish index 2c4a2251..0683f40e 100644 --- a/etc/config.fish +++ b/etc/config.fish @@ -28,8 +28,8 @@ if status --is-login # Put linux consoles in unicode mode. # - if expr "$LANG" : ".*\.[Uu][Tt][Ff].*" >/dev/null - if test "$TERM" = linux + if test "$TERM" = linux + if expr "$LANG" : ".*\.[Uu][Tt][Ff].*" >/dev/null if which unicode_start >/dev/null unicode_start end @@ -460,6 +460,9 @@ int main(int argc, char **argv) const io_chain_t empty_ios; if (read_init(paths)) { + /* Stop the exit status of any initialization commands (#635) */ + proc_set_last_status(STATUS_BUILTIN_OK); + /* Run the commands specified as arguments, if any */ if (! cmds.empty()) { |