From caf41a7ac959768f8878a9bb9d3f0ae2d9726f79 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 30 Nov 2021 21:51:17 +0800
Subject: vim-patch:8.2.3703: most people call F# "fsharp" and not "fs"
 (#16469)

Problem:    Most people call F# "fsharp" and not "fs".
Solution:   Rename filetype "fs" to "fsharp".
https://github.com/vim/vim/commit/53ba95e4f0a82f6dab1791bb01f6cddc9b3f61b3
---
 runtime/autoload/dist/ft.vim | 2 +-
 runtime/filetype.vim         | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 0cbcb1bbb5..74df871544 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -231,7 +231,7 @@ func dist#ft#FTfs()
 	  \ || line =~ '^\s*: \S'
       setf forth
     else
-      setf fs
+      setf fsharp
     endif
   endif
 endfunc
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 0cad37531d..cc28dba1d0 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -630,9 +630,6 @@ au BufNewFile,BufRead *.mas,*.master		setf master
 " Forth
 au BufNewFile,BufRead *.ft,*.fth		setf forth
 
-" F# or Forth
-au BufNewFile,BufRead *.fs			call dist#ft#FTfs()
-
 " Reva Forth
 au BufNewFile,BufRead *.frt			setf reva
 
@@ -648,6 +645,12 @@ au BufNewFile,BufRead *.fsl			setf framescript
 " FStab
 au BufNewFile,BufRead fstab,mtab		setf fstab
 
+" F# or Forth
+au BufNewFile,BufRead *.fs			call dist#ft#FTfs()
+
+" F#
+au BufNewFile,BufRead *.fsi,*.fsx		setf fsharp
+
 " GDB command files
 au BufNewFile,BufRead .gdbinit,gdbinit		setf gdb
 
-- 
cgit