To: vim_dev@googlegroups.com Subject: Patch 8.2.4729 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4729 Problem: HEEx and Surface templates do not need a separate filetype. Solution: Use Eelixir for the similar filetypes. (Aaron Tinio, closes #10124) Files: runtime/filetype.vim, src/testdir/test_filetype.vim *** ../vim-8.2.4728/runtime/filetype.vim 2022-04-09 16:08:04.951820681 +0100 --- runtime/filetype.vim 2022-04-10 12:13:01.746679411 +0100 *************** *** 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 --- 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 *************** *** 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 --- 797,802 ---- *************** *** 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 --- 1902,1907 ---- *** ../vim-8.2.4728/src/testdir/test_filetype.vim 2022-04-09 16:08:04.951820681 +0100 --- src/testdir/test_filetype.vim 2022-04-10 12:04:13.875349705 +0100 *************** *** 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'], --- 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'], *************** *** 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'], --- 237,242 ---- *************** *** 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'], --- 516,521 ---- *** ../vim-8.2.4728/src/version.c 2022-04-10 11:43:58.901332598 +0100 --- src/version.c 2022-04-10 12:13:23.710652583 +0100 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 4729, /**/ -- "Lisp has all the visual appeal of oatmeal with nail clippings thrown in." -- Larry Wall /// 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 ///