Bravely allow setting the cursor shape in iTerm2 by default

The recent improvements to multiline prompts and vi-mode in #3481 appear
to be sufficient to make iTerm2 well behaved, so remove our hack which
disabled it by default.

Fixes #3696

CHANGELOG.rst

@@ -96,6 +96,7 @@ Interactive improvements
 - ``fish_add_path`` now prints a message for skipped non-existent paths when using the ``-v`` flag (:issue:`8884`).
 - Since fish 3.2.0, pressing :kbd:`Control-D` while a command is running would end up inserting a space into the next commandline, which has been fixed (:issue:`8871`).
 - A bug that caused multi-line prompts to be moved down a line when pasting or switching modes has been fixed (:issue:`3481`).
+- Changing the cursor shape is now enabled by default in iTerm2. (:issue:`3696`).
 - The web-based configuration system no longer strips too many quotes in the abbreviation display (:issue:`8917`, :issue:`8918`).
 - Fish started with ``--no-config`` will now use the default keybindings (:issue:`8493`)
 - When fish inherits a $USER value that doesn't correspond to the euid, it will now correct it in all cases instead of just when euid is 0 (:issue:`8879`, :issue:`8583`).

share/functions/fish_vi_cursor.fish

@@ -54,14 +54,6 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
             and not string match -q 'foot*' -- $TERM
             return
         end
-
-        # HACK: Explicitly disable on ITERM because of #3696, which is weirdness with multi-line prompts.
-        # --force-iterm is now deprecated; set $fish_vi_force_cursor instead
-        if contains -- $argv[1] --force-iterm
-            set -e argv[1]
-        else if set -q ITERM_PROFILE
-            return
-        end
     end
 
     set -l terminal $argv[1]