From 1415c5b66dad8b50b3e172f09d466682154b5f11 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Tue, 27 Dec 2022 07:58:56 -0500
Subject: [PATCH] Move fish 'shell' override down with other reparative
 behaviors

---
 plugin/sensible.vim | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugin/sensible.vim b/plugin/sensible.vim
index 18be551..889edb8 100644
--- a/plugin/sensible.vim
+++ b/plugin/sensible.vim
@@ -62,10 +62,6 @@ if has('path_extra')
   setglobal tags-=./tags tags-=./tags; tags^=./tags;
 endif
 
-if &shell =~# 'fish$' && (v:version < 704 || v:version == 704 && !has('patch276'))
-  set shell=/usr/bin/env\ bash
-endif
-
 set autoread
 
 if &history < 1000
@@ -85,6 +81,11 @@ if &t_Co == 8 && $TERM !~# '^Eterm'
   set t_Co=16
 endif
 
+" If the running Vim lacks support for the Fish shell, use Bash instead.
+if &shell =~# 'fish$' && (v:version < 704 || v:version == 704 && !has('patch276'))
+  set shell=/usr/bin/env\ bash
+endif
+
 " Disable a legacy behavior that can break plugin maps.
 if has('langmap') && exists('+langremap') && &langremap
   set nolangremap