Patch 8.2.4733 (after 8.2.4729)
Problem: HEEx and Surface do need a separate filetype.
Solution: Revert 8.2.4729. (closes #10147)
Files: runtime/filetype.vim, src/testdir/test_filetype.vim
*** ../vim-8.2.4732/runtime/filetype.vim 2022-04-10 12:13:52.286617779
+0100
--- runtime/filetype.vim 2022-04-11 11:29:17.143100912 +0100
***************
*** 416,424 ****
" Elixir or Euphoria
au BufNewFile,BufRead *.ex call dist#ft#ExCheck()
! " Elixir, also used for HEEx and Surface
au BufRead,BufNewFile mix.lock,*.exs setf elixir
! au BufRead,BufNewFile *.eex,*.heex,*.leex,*.sface setf eelixir
" Elvish
au BufRead,BufNewFile *.elv setf elvish
--- 416,424 ----
" Elixir or Euphoria
au BufNewFile,BufRead *.ex call dist#ft#ExCheck()
! " Elixir
au BufRead,BufNewFile mix.lock,*.exs setf elixir
! au BufRead,BufNewFile *.eex,*.leex setf eelixir
" Elvish
au BufRead,BufNewFile *.elv setf elvish
***************
*** 797,802 ****
--- 797,805 ----
" Hercules
au BufNewFile,BufRead *.vc,*.ev,*.sum,*.errsum setf hercules
+ " HEEx
+ au BufRead,BufNewFile *.heex setf heex
+
" HEX (Intel)
au BufNewFile,BufRead *.hex,*.h32 setf hex
***************
*** 1902,1907 ****
--- 1905,1913 ----
" SVG (Scalable Vector Graphics)
au BufNewFile,BufRead *.svg setf svg
+ " Surface
+ au BufRead,BufNewFile *.sface setf surface
+
" Tads (or Nroff or Perl test file)
au BufNewFile,BufRead *.t
\ if !dist#ft#FTnroff() && !dist#ft#FTperl() | setf tads | endif
*** ../vim-8.2.4732/src/testdir/test_filetype.vim 2022-04-10
12:13:52.286617779 +0100
--- src/testdir/test_filetype.vim 2022-04-11 11:29:17.143100912 +0100
***************
*** 166,172 ****
\ 'edif': ['file.edf', 'file.edif', 'file.edo'],
\ 'elinks': ['elinks.conf'],
\ 'elixir': ['file.ex', 'file.exs', 'mix.lock'],
! \ 'eelixir': ['file.eex', 'file.heex', 'file.leex', 'file.sface'],
\ 'elm': ['file.elm'],
\ 'elmfilt': ['filter-rules'],
\ 'elvish': ['file.elv'],
--- 166,172 ----
\ 'edif': ['file.edf', 'file.edif', 'file.edo'],
\ 'elinks': ['elinks.conf'],
\ 'elixir': ['file.ex', 'file.exs', 'mix.lock'],
! \ 'eelixir': ['file.eex', 'file.leex'],
\ 'elm': ['file.elm'],
\ 'elmfilt': ['filter-rules'],
\ 'elvish': ['file.elv'],
***************
*** 237,242 ****
--- 237,243 ----
\ 'hb': ['file.hb'],
\ 'hcl': ['file.hcl'],
\ 'hercules': ['file.vc', 'file.ev', 'file.sum', 'file.errsum'],
+ \ 'heex': ['file.heex'],
\ 'hex': ['file.hex', 'file.h32'],
\ 'hgcommit': ['hg-editor-file.txt'],
\ 'hjson': ['file.hjson'],
***************
*** 516,521 ****
--- 517,523 ----
\ 'stata': ['file.ado', 'file.do', 'file.imata', 'file.mata'],
\ 'stp': ['file.stp'],
\ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp', '/etc/sudoers',
'any/etc/sudoers.d/file'],
+ \ 'surface': ['file.sface'],
\ 'svg': ['file.svg'],
\ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'],
\ 'swift': ['file.swift'],
***************
*** 928,933 ****
--- 930,936 ----
call assert_equal('dat', &filetype)
bwipe!
call delete('datfile.DAT')
+ unlet g:filetype_dat
filetype off
endfunc
***************
*** 1522,1527 ****
--- 1525,1531 ----
call assert_equal('src', &filetype)
bwipe!
call delete('srcfile.SRC')
+ unlet g:filetype_src
filetype off
endfunc
*** ../vim-8.2.4732/src/version.c 2022-04-10 18:09:03.079959724 +0100
--- src/version.c 2022-04-11 11:36:53.630530082 +0100
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 4733,
/**/
--
OLD WOMAN: Well, how did you become king, then?
ARTHUR: The Lady of the Lake, her arm clad in the purest shimmering samite,
held Excalibur aloft from the bosom of the water to signify by Divine
Providence ... that I, Arthur, was to carry Excalibur ... That is
why I am your king!
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20220411103829.799E31C0917%40moolenaar.net.
