To: vim_dev@googlegroups.com Subject: Patch 8.2.3703 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3703 (after 8.2.3686) Problem: Most people call F# "fsharp" and not "fs". Solution: Rename filetype "fs" to "fsharp". Files: runtime/autoload/dist/ft.vim, runtime/filetype.vim, src/testdir/test_filetype.vim *** ../vim-8.2.3702/runtime/autoload/dist/ft.vim 2021-11-27 17:21:54.085161469 +0000 --- runtime/autoload/dist/ft.vim 2021-11-30 12:58:12.877492002 +0000 *************** *** 231,237 **** \ || line =~ '^\s*: \S' setf forth else ! setf fs endif endif endfunc --- 231,237 ---- \ || line =~ '^\s*: \S' setf forth else ! setf fsharp endif endif endfunc *** ../vim-8.2.3702/runtime/filetype.vim 2021-11-27 17:21:54.085161469 +0000 --- runtime/filetype.vim 2021-11-30 12:58:12.877492002 +0000 *************** *** 634,642 **** " 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 --- 634,639 ---- *************** *** 652,657 **** --- 649,660 ---- " 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 *** ../vim-8.2.3702/src/testdir/test_filetype.vim 2021-11-27 17:21:54.085161469 +0000 --- src/testdir/test_filetype.vim 2021-11-30 12:58:12.877492002 +0000 *************** *** 187,193 **** \ 'fpcmake': ['file.fpc'], \ 'framescript': ['file.fsl'], \ 'freebasic': ['file.fb', 'file.bi'], ! \ 'fs': ['file.fs'], \ 'fstab': ['fstab', 'mtab'], \ 'fvwm': ['/.fvwm/file', 'any/.fvwm/file'], \ 'gdb': ['.gdbinit', 'gdbinit'], --- 187,193 ---- \ 'fpcmake': ['file.fpc'], \ 'framescript': ['file.fsl'], \ 'freebasic': ['file.fb', 'file.bi'], ! \ 'fsharp': ['file.fs', 'file.fsi', 'file.fsx'], \ 'fstab': ['fstab', 'mtab'], \ 'fvwm': ['/.fvwm/file', 'any/.fvwm/file'], \ 'gdb': ['.gdbinit', 'gdbinit'], *************** *** 977,983 **** call writefile(['looks like F#'], 'Xfile.fs') split Xfile.fs ! call assert_equal('fs', &filetype) bwipe! let g:filetype_fs = 'forth' --- 977,983 ---- call writefile(['looks like F#'], 'Xfile.fs') split Xfile.fs ! call assert_equal('fsharp', &filetype) bwipe! let g:filetype_fs = 'forth' *** ../vim-8.2.3702/src/version.c 2021-11-30 11:56:19.034972194 +0000 --- src/version.c 2021-11-30 13:02:39.052921818 +0000 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 3703, /**/ -- BODY: I'm not dead! CART DRIVER: 'Ere. He says he's not dead. LARGE MAN: Yes he is. BODY: I'm not! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///