Only show fish greeting for interactive logins

This is a regression introduced by 834ebef53c
Bolster with a check for only login sessions too -- hopefully makes it
less annooying on subshells in general.

Fixes #3261

build_tools/style.fish

@@ -101,7 +101,7 @@ if set -q f_files[1]
             echo $file
             rm $file.new
         else
-            echo (set_color --underline)$file(set_color normal)is being reformatted
+            echo (set_color --underline)$file(set_color normal) is being reformatted
             mv $file.new $file
         end
     end

share/functions/__fish_config_interactive.fish

@@ -110,9 +110,10 @@ function __fish_config_interactive -d "Initializations that should be performed
     # Print a greeting.
     # fish_greeting can be a function (preferred) or a variable.
     #
-    if status --is-interactive and status --is-login
+    if status --is-interactivel
+        and status --is-login
         if functions -q fish_greeting
-                fish_greeting
+            fish_greeting
         else
             # The greeting used to be skipped when fish_greeting was empty (not just undefined)
             # Keep it that way to not print superfluous newlines on old configuration