Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vim-plugins for openSUSE:Factory checked in at 2022-08-12 16:07:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vim-plugins (Old) and /work/SRC/openSUSE:Factory/.vim-plugins.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vim-plugins" Fri Aug 12 16:07:01 2022 rev:41 rq:994745 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/vim-plugins/vim-plugins.changes 2022-03-11 11:37:23.086346009 +0100 +++ /work/SRC/openSUSE:Factory/.vim-plugins.new.1521/vim-plugins.changes 2022-08-12 16:07:28.203619106 +0200 @@ -1,0 +2,12 @@ +Fri Aug 5 09:15:57 UTC 2022 - Jiri Slaby <jsl...@suse.cz> + +- update + * bufexplorer 7.4.24 + * editorconfig 1.1.1 + * fugitive 3.7 + * latex 1.10.0+20220519 + * markdown 2.0.0+20220507 + * neomutt 20220612 +- add check_for_updates.pl script + +------------------------------------------------------------------- Old: ---- bufexplorer-7.4.21.tar.gz neomutt.vim-20210218.obscpio vim-latex-1.10.0+20210818.obscpio vim-markdown-2.0.0+20220129.obscpio vimplugin-editorconfig-0.3.3.tar.gz vimplugin-fugitive-3.4.tar.gz New: ---- bufexplorer-7.4.24.tar.gz check_for_updates.pl neomutt.vim-20220612.obscpio vim-latex-1.10.0+20220519.obscpio vim-markdown-2.0.0+20220507.obscpio vimplugin-editorconfig-1.1.1.tar.gz vimplugin-fugitive-3.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vim-plugins.spec ++++++ --- /var/tmp/diff_new_pack.Y9Sedd/_old 2022-08-12 16:07:28.979621439 +0200 +++ /var/tmp/diff_new_pack.Y9Sedd/_new 2022-08-12 16:07:28.983621451 +0200 @@ -20,24 +20,24 @@ %define align_version_orig 37-43 %define align_version 37.43 %define a_version 2.18 -%define bufexplorer_version 7.4.21 +%define bufexplorer_version 7.4.24 %define calendar_version 2.5 %define colorsel_version 20110107 %define colorschemes_version 1.0 %define diffchanges_tag 346dae2 %define diffchanges_version 0.6+g346dae2 -%define editorconfig_version 0.3.3 +%define editorconfig_version 1.1.1 %define file_line_version 1.0+20161020 -%define fugitive_version 3.4 +%define fugitive_version 3.7 %define gitdiff_version 2 %define gnupg_version 2.7.1 -%define latex_version 1.10.0+20210818 +%define latex_version 1.10.0+20220519 %define locateopen_version 1.3 -%define markdown_version 2.0.0+20220129 +%define markdown_version 2.0.0+20220507 %define matrix_version 1.10 %define minibufexpl_version 6.3.2 %define multiplesearch_version 1.3 -%define neomutt_version 20210218 +%define neomutt_version 20220612 %define NERDcommenter_version 2.6.0 %define NERDtree_version 6.10.16 %define project_version 1.4.1 @@ -95,9 +95,9 @@ Source30: https://github.com/vim-scripts/gitdiff.vim/archive/refs/tags/%{gitdiff_version}.tar.gz#/vimplugin-gitdiff-%{gitdiff_version}.tar.gz Source31: https://github.com/vim-scripts/snipMate/archive/refs/tags/%{snipmate_version}.tar.gz#/vimplugin-snipmate-%{snipmate_version}.tar.gz Source32: https://github.com/vim-scripts/rails.vim/archive/refs/tags/%{rails_version}.tar.gz#/vimplugin-rails-%{rails_version}.tar.gz -Source33: https://github.com/mileszs/ack.vim/archive/%{ack_version}.tar.gz#/vimplugin-ack-%{ack_version}.tar.gz -Source34: https://github.com/editorconfig/editorconfig-vim/archive/v%{editorconfig_version}.tar.gz#/vimplugin-editorconfig-%{editorconfig_version}.tar.gz -Source35: https://github.com/tpope/vim-fugitive/archive/v%{fugitive_version}.tar.gz#/vimplugin-fugitive-%{fugitive_version}.tar.gz +Source33: https://github.com/mileszs/ack.vim/archive/refs/tags/%{ack_version}.tar.gz#/vimplugin-ack-%{ack_version}.tar.gz +Source34: https://github.com/editorconfig/editorconfig-vim/archive/refs/tags/v%{editorconfig_version}.tar.gz#/vimplugin-editorconfig-%{editorconfig_version}.tar.gz +Source35: https://github.com/tpope/vim-fugitive/archive/refs/tags/v%{fugitive_version}.tar.gz#/vimplugin-fugitive-%{fugitive_version}.tar.gz # from _service Source100: file-line-%{file_line_version}.tar.xz Source101: vim-markdown-%{markdown_version}.tar.xz @@ -106,6 +106,7 @@ Source104: vim-latex-%{latex_version}.tar.xz Source200: gitrebase.vim Source1000: https://raw.githubusercontent.com/openSUSE/pack-tools/master/contrib/vim/spec.snippets +Source1001: check_for_updates.pl Patch1: locateopen-1.3-locate-support.patch Patch2: showmarks-signs.patch Patch3: file-line-Fix-other-plugins-loading.patch @@ -296,7 +297,7 @@ Requires: git-core %description -n vim-plugin-gitrebase-keywordprg -Set keywordprg in git rebase --interactive. This was used to done before vim +Set keywordprg in git rebase --interactive. This used to done before vim 8.2.4529, but was changed afterwards. For details, see https://github.com/vim/vim/issues/9845. @@ -832,6 +833,8 @@ %defattr(-,root,root,0755) %license editorconfig-vim-%{editorconfig_version}/LICENSE %vimplugin_dir/plugin/editorconfig.vim +%vimplugin_dir/autoload/editorconfig_core/ +%vimplugin_dir/autoload/editorconfig_core.vim %vimplugin_dir/autoload/editorconfig.vim %vimplugin_dir/doc/editorconfig.txt ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Y9Sedd/_old 2022-08-12 16:07:29.043621631 +0200 +++ /var/tmp/diff_new_pack.Y9Sedd/_new 2022-08-12 16:07:29.047621644 +0200 @@ -5,7 +5,6 @@ <param name="versionformat">@PARENT_TAG@+%cd</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> - <param name="revision">559088afaf10124ea663ee0f4f73b1de48fb1632</param> </service> <service name="tar" mode="buildtime"> <param name="obsinfo">file-line.obsinfo</param> @@ -15,7 +14,7 @@ <param name="url">https://github.com/neomutt/neomutt.vim.git</param> <param name="scm">git</param> <param name="versionformat">%cd</param> - <param name="revision">15b06057a75e5b648b1c1c692c870bc7f052d0c9</param> + <param name="revision">origin/main</param> </service> <service name="tar" mode="buildtime"> <param name="obsinfo">neomutt.vim.obsinfo</param> @@ -25,7 +24,6 @@ <param name="url">https://github.com/saltstack/salt-vim.git</param> <param name="scm">git</param> <param name="versionformat">%cd</param> - <param name="revision">6ca9e3500cc39dd417b411435d58a1b720b331cc</param> </service> <service name="tar" mode="buildtime"> <param name="obsinfo">salt-vim.obsinfo</param> @@ -37,7 +35,6 @@ <param name="versionformat">@PARENT_TAG@+%cd</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> - <param name="revision">0760891c71e4c332d0b07704f2356bc4f56a7128</param> </service> <service name="tar" mode="buildtime"> <param name="obsinfo">vim-latex.obsinfo</param> @@ -47,7 +44,6 @@ <param name="url">https://github.com/plasticboy/vim-markdown</param> <param name="scm">git</param> <param name="versionformat">@PARENT_TAG@+%cd</param> - <param name="revision">50d42082819cfa91745b6eff6e28ad5cbc8b27fa</param> </service> <service name="tar" mode="buildtime"> <param name="obsinfo">vim-markdown.obsinfo</param> ++++++ bufexplorer-7.4.21.tar.gz -> bufexplorer-7.4.24.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bufexplorer-7.4.21/README.md new/bufexplorer-7.4.24/README.md --- old/bufexplorer-7.4.21/README.md 2018-12-10 15:31:03.000000000 +0100 +++ new/bufexplorer-7.4.24/README.md 2022-05-04 01:47:26.000000000 +0200 @@ -5,12 +5,16 @@ With bufexplorer, you can quickly and easily switch between buffers by using the one of the default public interfaces: - '<Leader>be' (normal open) or - '<Leader>bt' (toggle open / close) or - '<Leader>bs' (force horizontal split open) or - '<Leader>bv' (force vertical split open) +`\<Leader\>be` normal open -Once the bufexplorer window is open you can use the normal movement keys (hjkl) to move around and then use <Enter> or <Left-Mouse-Click> to select the buffer you would like to open. If you would like to have the selected buffer opened in a new tab, simply press either <Shift-Enter> or 't'. Please note that when opening a buffer in a tab, that if the buffer is already in another tab, bufexplorer can switch to that tab automatically for you if you would like. More about that in the supplied VIM help. +`\<Leader\>bt` toggle open / close + +`\<Leader\>bs` force horizontal split open + +`\<Leader\>bv` force vertical split open + + +Once the bufexplorer window is open you can use the normal movement keys (hjkl) to move around and then use `<Enter>` or `<Left-Mouse-Click>` to select the buffer you would like to open. If you would like to have the selected buffer opened in a new tab, simply press either `<Shift-Enter>` or `t`. Please note that when opening a buffer in a tab, that if the buffer is already in another tab, bufexplorer can switch to that tab automatically for you if you would like. More about that in the supplied VIM help. Bufexplorer also offers various options including: - Display the list of buffers in various sort orders including: @@ -28,8 +32,8 @@ ## Installation ### Manually -1. If you do not want to use on the the bundle handlers, you can take the zip - file from vim.org and unzip it and copy the plugin to your vimfiles\plugin +1. If you do not want to use one of the the bundle handlers, you can take the + zip file from vim.org and unzip it and copy the plugin to your vimfiles\plugin directory and the txt file to your vimfiles\doc directory. If you do that, make sure you generate the help by executing @@ -57,7 +61,7 @@ Plug 'jlanzarotta/bufexplorer' -2. Instal with `:PlugInstall`. +2. Install with `:PlugInstall`. ### Pathogen 1. Install with the following command. @@ -65,7 +69,7 @@ git clone https://github.com/jlanzarotta/bufexplorer.git ~/.vim/bundle/bufexplorer.vim ## License -Copyright (c) 2001-2018, Jeff Lanzarotta +Copyright (c) 2001-2022, Jeff Lanzarotta All rights reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bufexplorer-7.4.21/doc/bufexplorer.txt new/bufexplorer-7.4.24/doc/bufexplorer.txt --- old/bufexplorer-7.4.21/doc/bufexplorer.txt 2018-12-10 15:31:03.000000000 +0100 +++ new/bufexplorer-7.4.24/doc/bufexplorer.txt 2022-05-04 01:47:26.000000000 +0200 @@ -1,7 +1,7 @@ -*bufexplorer.txt* Buffer Explorer Last Change: 08 Dec 2018 +*bufexplorer.txt* Buffer Explorer Last Change: 02 May 2022 Buffer Explorer *buffer-explorer* *bufexplorer* - Version 7.4.21 + Version 7.4.24 Plugin for easily exploring (or browsing) Vim|:buffers|. @@ -53,7 +53,7 @@ you may simply change the leader (see |mapleader|). When <Leader>bs or <Leader>bv is issued, bufexplorer opens in either a -horizontally or vertically split window. By issusing either of these commands, +horizontally or vertically split window. By issuing either of these commands, the user is telling bufexplorer that they want to split the window and have bufexplorer show the buffer they are about to select (from the bufexplorer windows) in the newly split window. When <Leader>be is issued, bufexplorer @@ -250,12 +250,12 @@ *g:bufExplorerSplitVertSize* To control the size of the new vertical split window, use: > - let g:bufExplorerVertSize=n " New split window is n columns wide. - let g:bufExplorerVertSize=0 " New split windows size set by Vim. + let g:bufExplorerSplitVertSize=n " New split window is n columns wide. + let g:bufExplorerSplitVertSize=0 " New split windows size set by Vim. The default is 0, so that the size is set by Vim. *g:bufExplorerVersionWarn* -To control wether to warning about Vim version or not, use: > +To control whether to warning about Vim version or not, use: > let g:bufExplorerVersionWarn=1 " Warn if version conflict. let g:bufExplorerVersionWarn=0 " Do not warn if version conflict. The default is 1. @@ -263,6 +263,17 @@ =============================================================================== CHANGE LOG *bufexplorer-changelog* +7.4.23 January 23, 2022 + - Merged in changes from benoit-pierre that fixes an error thrown when vim + is in read-only mode. + - Merged in changes from tartansandal that implements the use of an + independent variable to track window splitting since s:splitMode != '' + no longer implies that a split was triggered. +7.4.22 January 5,2022 + - Merged in change from nadean that fixed an issue that if you use either + split mode, you could no longer use the regular non-split mode. This was + because the split mode set s:splitMode and that variable was never reset + to "" to allow you run without split mode. 7.4.21 December 8, 2018 - Merged in changes from adelarsq that introduced ryanoasis/vim-devicons support. If the global g:loaded_webdevicons has been set, bufexplorer @@ -774,7 +785,7 @@ =============================================================================== COPYRIGHT *bufexplorer-copyright* -Copyright (c) 2001-2017, Jeff Lanzarotta +Copyright (c) 2001-2022, Jeff Lanzarotta All rights reserved. Redistribution and use in source and binary forms, with or without diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bufexplorer-7.4.21/plugin/bufexplorer.vim new/bufexplorer-7.4.24/plugin/bufexplorer.vim --- old/bufexplorer-7.4.21/plugin/bufexplorer.vim 2018-12-10 15:31:03.000000000 +0100 +++ new/bufexplorer-7.4.24/plugin/bufexplorer.vim 2022-05-04 01:47:26.000000000 +0200 @@ -1,5 +1,5 @@ "============================================================================ -" Copyright: Copyright (c) 2001-2018, Jeff Lanzarotta +" Copyright: Copyright (c) 2001-2022, Jeff Lanzarotta " All rights reserved. " " Redistribution and use in source and binary forms, with or @@ -35,8 +35,8 @@ " EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. " Name Of File: bufexplorer.vim " Description: Buffer Explorer Vim Plugin -" Maintainer: Jeff Lanzarotta (delux256-vim at outlook dot com) -" Last Changed: Saturday, 08 December 2018 +" Maintainer: Jeff Lanzarotta (my name at gmail dot com) +" Last Changed: Thursday, 02 May 2022 " Version: See g:bufexplorer_version for version number. " Usage: This file should reside in the plugin directory and be " automatically sourced. @@ -74,7 +74,7 @@ "1}}} " Version number -let g:bufexplorer_version = "7.4.21" +let g:bufexplorer_version = "7.4.24" " Plugin Code {{{1 " Check for Vim version {{{2 @@ -132,6 +132,7 @@ let s:running = 0 let s:sort_by = ["number", "name", "fullpath", "mru", "extension"] let s:splitMode = "" +let s:didSplit = 0 let s:types = {"fullname": ':p', "path": ':p:h', "relativename": ':~:.', "relativepath": ':~:.:h', "shortname": ':t'} " Setup the autocommands that handle the MRUList and other stuff. {{{2 @@ -312,7 +313,7 @@ " ShouldIgnore {{{2 function! s:ShouldIgnore(buf) " Ignore temporary buffers with buftype set. - if empty(getbufvar(a:buf, "&buftype") == 0) + if empty(getbufvar(a:buf, "&buftype")) == 0 return 1 endif @@ -361,6 +362,7 @@ let s:running = 0 let s:splitMode = "" + let s:didSplit = 0 delmarks! endfunction @@ -392,12 +394,14 @@ function! BufExplorerHorizontalSplit() let s:splitMode = "sp" execute "BufExplorer" + let s:splitMode = "" endfunction " BufExplorerVerticalSplit {{{2 function! BufExplorerVerticalSplit() let s:splitMode = "vsp" execute "BufExplorer" + let s:splitMode = "" endfunction " ToggleBufExplorer {{{2 @@ -451,6 +455,9 @@ " Restore the original settings. let [&splitbelow, &splitright] = [_splitbelow, _splitright] + + " Remember that a split was triggered + let s:didSplit = 1 endif if !exists("b:displayMode") || b:displayMode != "winmanager" @@ -473,6 +480,7 @@ " the buffer using CTRL-^. setlocal buftype=nofile setlocal modifiable + setlocal noreadonly setlocal noswapfile setlocal nowrap @@ -919,7 +927,7 @@ endif " Switch to the selected buffer. - execute "keepalt silent b!" _bufNbr + execute "keepjumps keepalt silent b!" _bufNbr endif " Make the buffer 'listed' again. @@ -957,12 +965,6 @@ let mode = a:mode - " Do not allow this buffer to be deleted if it is the last one. - if len(s:MRUList) == 1 - call s:Error("Sorry, you are not allowed to delete the last buffer") - return - endif - " These commands are to temporarily suspend the activity of winmanager. if exists("b:displayMode") && b:displayMode == "winmanager" call WinManagerSuspendAUs() @@ -1042,7 +1044,7 @@ endif " If we needed to split the main window, close the split one. - if s:splitMode != "" && bufwinnr(s:originBuffer) != -1 + if s:didSplit == 1 && bufwinnr(s:originBuffer) != -1 execute "wincmd c" endif ++++++ check_for_updates.pl ++++++ #!/usr/bin/perl use warnings; use strict; use Data::Dumper; use JSON; use LWP::UserAgent; open(SPEC, '<vim-plugins.spec') or die "cannot open spec"; my $spec; { local $/ = undef; $spec = <SPEC>; } close(SPEC); my $child = open(SPEC, '-|', qw|rpm -E|, $spec) // die "cannot run rpm"; exit 0 unless ($child); my $ua = LWP::UserAgent->new; my $json = JSON->new->allow_nonref; while (<SPEC>) { chomp; my ($org, $repo, $rel, $ver) = (m@^Source\d+:\s+https://github\.com/([^/]+)/([^/]+)/(?:archive/refs/tags|releases/download/([^/]+))/([^/]+)\.tar\.gz#@); next unless defined $ver; $ver = $rel if defined $rel; my $req_url = defined $rel ? 'releases/latest' : 'tags'; my $req = HTTP::Request->new(GET => "https://api.github.com/repos/$org/$repo/$req_url";); my $res = $ua->request($req); die "bad HTTP reply for $org/$repo -- \"" . $res->status_line . '"' unless ($res->is_success); my $j = $json->decode($res->content); $j = @{$j}[0] unless (defined $rel); my $ver2 = $j->{'name'} || $j->{'tag_name'}; if ($ver2 ne $ver) { print "$org, $repo, $ver -> $ver2\n"; } } close(SPEC); 1; ++++++ neomutt.vim-20210218.obscpio -> neomutt.vim-20220612.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neomutt.vim-20210218/.github/FUNDING.yml new/neomutt.vim-20220612/.github/FUNDING.yml --- old/neomutt.vim-20210218/.github/FUNDING.yml 2021-02-18 03:23:15.000000000 +0100 +++ new/neomutt.vim-20220612/.github/FUNDING.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -custom: paypal.me/russon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neomutt.vim-20210218/syntax/neomuttrc.vim new/neomutt.vim-20220612/syntax/neomuttrc.vim --- old/neomutt.vim-20210218/syntax/neomuttrc.vim 2021-02-18 03:23:15.000000000 +0100 +++ new/neomutt.vim-20220612/syntax/neomuttrc.vim 2022-06-12 21:01:52.000000000 +0200 @@ -2,10 +2,10 @@ " Language: NeoMutt setup files " Maintainer: Richard Russon <r...@flatcap.org> " Previous Maintainer: Guillaume Brogi <gui-...@netcourrier.com> -" Last Change: 2020-06-21 +" Last Change: 2022-04-08 " Original version based on syntax/muttrc.vim -" This file covers NeoMutt 2020-06-19 +" This file covers NeoMutt 2022-04-08 " quit when a syntax file was already loaded if exists("b:current_syntax") @@ -115,6 +115,8 @@ syntax region muttrcIndexFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcIndexFormatEscapes,muttrcIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr syntax region muttrcMixFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcMixFormatEscapes,muttrcMixFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr syntax region muttrcMixFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcMixFormatEscapes,muttrcMixFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr +syntax region muttrcPatternFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPatternFormatEscapes,muttrcPatternFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr +syntax region muttrcPatternFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPatternFormatEscapes,muttrcPatternFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr syntax region muttrcPGPCmdFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPGPCmdFormatEscapes,muttrcPGPCmdFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr syntax region muttrcPGPCmdFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPGPCmdFormatEscapes,muttrcPGPCmdFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr syntax region muttrcPGPFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPGPFormatEscapes,muttrcPGPFormatConditionals,muttrcFormatErrors,muttrcPGPTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr @@ -144,35 +146,37 @@ endif endfunction -" CHECKED 2020-06-21 -" Ref: alias_format_str() in alias/dlgalias.c +" CHECKED 2022-04-08 +" Ref: alias_format_str() in alias/dlg_alias.c call s:escapesConditionals('AliasFormat', '[acfnrt]', 1, 0) -" Ref: attach_format_str() in recvattach.c +" Ref: attach_format_str() in attach/dlg_attach.c call s:escapesConditionals('AttachFormat', '[CcDdeFfIMmnQsTtuX]', 1, 1) -" Ref: compose_format_str() in compose.c +" Ref: compose_format_str() in compose/cbar.c call s:escapesConditionals('ComposeFormat', '[ahlv]', 1, 1) -" Ref: folder_format_str() in browser.c +" Ref: folder_format_str() in browser/browser.c call s:escapesConditionals('FolderFormat', '[CDdFfgilmNnstu]', 1, 0) -" Ref: group_index_format_str() in browser.c +" Ref: group_index_format_str() in nntp/browse.c call s:escapesConditionals('GroupIndexFormat', '[CdfMNns]', 1, 1) " Ref: index_format_str() in hdrline.c call s:escapesConditionals('IndexFormat', '[AaBbCDdEefgHIiJKLlMmNnOPqRrSsTtuvWXxYyZ(<[{]\|@\i\+@\|G[a-zA-Z]\+\|Fp\=\|z[cst]\|cr\=', 1, 1) " Ref: mix_format_str() in remailer.c call s:escapesConditionals('MixFormat', '[acns]', 1, 0) +" Ref: pattern_format_str() in pattern/dlg_pattern.c +call s:escapesConditionals('PatternFormat', '[den]', 1, 0) " Ref: pgp_command_format_str() in ncrypt/pgpinvoke.c call s:escapesConditionals('PGPCmdFormat', '[afprs]', 0, 1) -" Ref: crypt_format_str() in ncrypt/crypt_gpgme.c -" Ref: pgp_entry_format_str() in ncrypt/pgpkey.c +" Ref: crypt_format_str() in ncrypt/dlg_gpgme.c +" Ref: pgp_entry_format_str() in ncrypt/dlg_pgp.c " Note: crypt_format_str() supports 'p', but pgp_entry_fmt() does not call s:escapesConditionals('PGPFormat', '[AaCcFfKkLlnptu[]', 0, 0) -" Ref: query_format_str() in alias/dlgquery.c +" Ref: query_format_str() in alias/dlg_query.c call s:escapesConditionals('QueryFormat', '[acent]', 1, 1) -" Ref: sidebar_format_str() in sidebar.c +" Ref: sidebar_format_str() in sidebar/window.c call s:escapesConditionals('SidebarFormat', '[!BDdFLNnorStZ]', 1, 1) " Ref: smime_command_format_str() in ncrypt/smime.c call s:escapesConditionals('SmimeFormat', '[aCcdfiks]', 0, 1) " Ref: status_format_str() in status.c -call s:escapesConditionals('StatusFormat', '[bDdFfhLlMmnoPpRrSstuVv]', 1, 1) +call s:escapesConditionals('StatusFormat', '[bDdFfhLlMmnoPpRrSsTtuVv]', 1, 1) syntax region muttrcPGPTimeEscapes contained start=+%\[+ end=+\]+ contains=muttrcStrftimeEscapes syntax region muttrcTimeEscapes contained start=+%(+ end=+)+ contains=muttrcStrftimeEscapes @@ -187,6 +191,7 @@ syntax match muttrcVarEqualsGrpIdxFmt contained skipwhite "=" nextgroup=muttrcGroupIndexFormatStr syntax match muttrcVarEqualsIdxFmt contained skipwhite "=" nextgroup=muttrcIndexFormatStr syntax match muttrcVarEqualsMixFmt contained skipwhite "=" nextgroup=muttrcMixFormatStr +syntax match muttrcVarEqualsPatternFmt contained skipwhite "=" nextgroup=muttrcPatternFormatStr syntax match muttrcVarEqualsPGPCmdFmt contained skipwhite "=" nextgroup=muttrcPGPCmdFormatStr syntax match muttrcVarEqualsPGPFmt contained skipwhite "=" nextgroup=muttrcPGPFormatStr syntax match muttrcVarEqualsQueryFmt contained skipwhite "=" nextgroup=muttrcQueryFormatStr @@ -197,9 +202,9 @@ syntax match muttrcVPrefix contained /[?&]/ nextgroup=muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr -" CHECKED 2020-06-21 -" List of the different screens in mutt (see Menus in keymap.c) -syntax keyword muttrcMenu contained alias attach browser compose editor generic index key_select_pgp key_select_smime mix pager pgp postpone query smime +" CHECKED 2022-04-08 +" List of the different screens in NeoMutt (see MenuNames in menu/type.c) +syntax keyword muttrcMenu contained alias attach autocrypt browser compose editor generic index key_select_pgp key_select_smime mix pager pgp postpone query smime syntax match muttrcMenuList "\S\+" contained contains=muttrcMenu syntax match muttrcMenuCommas /,/ contained @@ -234,12 +239,12 @@ syntax match muttrcBadAction contained "[^<>]\+" contains=muttrcEmail syntax match muttrcAction contained "<[^>]\{-}>" contains=muttrcBadAction,muttrcFunction,muttrcKeyName -" CHECKED 2020-06-21 -" First, functions that take regular expressions: +" CHECKED 2022-04-08 +" First, hooks that take regular expressions: syntax match muttrcRXHookNot contained /!\s*/ skipwhite nextgroup=muttrcRXHookString,muttrcRXHookStringNL syntax match muttrcRXHooks /\<\%(account\|append\|close\|crypt\|folder\|mbox\|open\|pgp\)-hook\>/ skipwhite nextgroup=muttrcRXHookNot,muttrcRXHookString,muttrcRXHookStringNL -" Now, functions that take patterns +" Now, hooks that take patterns syntax match muttrcPatHookNot contained /!\s*/ skipwhite nextgroup=muttrcPattern syntax match muttrcPatHooks /\<\%(charset\|iconv\|index-format\)-hook\>/ skipwhite nextgroup=muttrcPatHookNot,muttrcPattern syntax match muttrcPatHooks /\<\%(message\|reply\|send\|send2\|save\|fcc\|fcc-save\)-hook\>/ skipwhite nextgroup=muttrcPatHookNot,muttrcOptPattern @@ -295,10 +300,10 @@ syntax match muttrcUnAliasKey contained "\s*\w\+\s*" skipwhite nextgroup=muttrcUnAliasKey,muttrcUnAliasNL syntax match muttrcUnAliasNL contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcUnAliasKey,muttrcUnAliasNL -" CHECKED 2020-06-21 -" List of letters in Flags in pattern.c +" CHECKED 2022-04-08 +" List of letters in Flags in pattern/flags.c " Parameter: none -syntax match muttrcSimplePat contained "!\?\^\?[~][ADEFGgklNOPpQRSTuUvV#$=]" +syntax match muttrcSimplePat contained "!\?\^\?[~][ADEFGgklNOPpQRSTUuVv#$=]" " Parameter: range syntax match muttrcSimplePat contained "!\?\^\?[~][mnXz]\s*\%([<>-][0-9]\+[kM]\?\|[0-9]\+[kM]\?[-]\%([0-9]\+[kM]\?\)\?\)" " Parameter: date @@ -306,7 +311,7 @@ " Parameter: regex syntax match muttrcSimplePat contained "!\?\^\?[~][BbCcefHhIiLMstwxYy]\s*" nextgroup=muttrcSimplePatRXContainer " Parameter: pattern -syntax match muttrcSimplePat contained "!\?\^\?[%][bBcCefhHiLstxy]\s*" nextgroup=muttrcSimplePatString +syntax match muttrcSimplePat contained "!\?\^\?[%][BbCcefHhiLstxy]\s*" nextgroup=muttrcSimplePatString " Parameter: pattern syntax match muttrcSimplePat contained "!\?\^\?[=][bcCefhHiLstxy]\s*" nextgroup=muttrcSimplePatString syntax region muttrcSimplePat contained keepend start=+!\?\^\?[~](+ end=+)+ contains=muttrcSimplePat @@ -369,8 +374,8 @@ syntax keyword muttrcMono contained mono skipwhite nextgroup=muttrcColorField,muttrcColorCompose syntax match muttrcMonoLine "^\s*mono\s\+\S\+" skipwhite nextgroup=muttrcMonoAttrib contains=muttrcMono -" CHECKED 2020-06-21 -" List of fields in Fields in color.c +" CHECKED 2022-04-08 +" List of fields in ColorFields in color/commmand.c syntax keyword muttrcColorField skipwhite contained \ attachment attach_headers body bold error hdrdefault header index index_author \ index_collapsed index_date index_flags index_label index_number index_size index_subject @@ -383,8 +388,8 @@ syntax match muttrcColorCompose skipwhite contained /\s*compose\s*/ nextgroup=muttrcColorComposeField -" CHECKED 2020-06-21 -" List of fields in ComposeFields in color.c +" CHECKED 2022-04-08 +" List of fields in ComposeColorFields in color/command.c syntax keyword muttrcColorComposeField skipwhite contained \ header security_both security_encrypt security_none security_sign \ nextgroup=muttrcColorFG,muttrcColorFGNL @@ -411,20 +416,21 @@ endfunction -" CHECKED 2020-06-21 +" CHECKED 2022-04-08 " List of DT_BOOL in MuttVars in mutt_config.c call s:boolQuadGen('Bool', [ - \ 'abort_backspace', 'allow_8bit', 'allow_ansi', 'arrow_cursor', 'ascii_chars', 'ask_bcc', 'askbcc', - \ 'ask_cc', 'askcc', 'ask_follow_up', 'ask_x_comment_to', 'attach_save_without_prompting', - \ 'attach_split', 'autocrypt', 'autocrypt_reply', 'auto_edit', 'autoedit', 'auto_subscribe', 'auto_tag', + \ 'abort_backspace', 'allow_8bit', 'allow_ansi', 'arrow_cursor', 'ascii_chars', 'ask_bcc', + \ 'ask_cc', 'ask_follow_up', 'ask_x_comment_to', 'attach_save_without_prompting', + \ 'attach_split', 'autocrypt', 'autocrypt_reply', 'auto_edit', 'auto_subscribe', 'auto_tag', \ 'beep', 'beep_new', 'bounce_delivered', 'braille_friendly', \ 'browser_abbreviate_mailboxes', 'change_folder_next', 'check_mbox_size', 'check_new', - \ 'collapse_all', 'collapse_flagged', 'collapse_unread', 'confirm_append', 'confirmappend', 'confirm_create', 'confirmcreate', - \ 'crypt_auto_encrypt', 'crypt_autoencrypt', 'crypt_auto_pgp', 'crypt_autopgp', 'crypt_auto_sign', 'crypt_autosign', 'crypt_auto_smime', 'crypt_autosmime', - \ 'crypt_confirm_hook', 'crypt_confirmhook', 'crypt_opportunistic_encrypt', + \ 'collapse_all', 'collapse_flagged', 'collapse_unread', 'compose_show_user_headers', + \ 'confirm_append', 'confirm_create', 'copy_decode_weed', 'count_alternatives', + \ 'crypt_auto_encrypt', 'crypt_auto_pgp', 'crypt_auto_sign', 'crypt_auto_smime', + \ 'crypt_confirm_hook', 'crypt_opportunistic_encrypt', \ 'crypt_opportunistic_encrypt_strong_keys', 'crypt_protected_headers_read', - \ 'crypt_protected_headers_save', 'crypt_protected_headers_write', 'crypt_reply_encrypt', 'crypt_replyencrypt', - \ 'crypt_reply_sign', 'crypt_replysign', 'crypt_reply_sign_encrypted', 'crypt_replysignencrypted', 'crypt_timestamp', 'crypt_use_gpgme', + \ 'crypt_protected_headers_save', 'crypt_protected_headers_write', 'crypt_reply_encrypt', + \ 'crypt_reply_sign', 'crypt_reply_sign_encrypted', 'crypt_timestamp', 'crypt_use_gpgme', \ 'crypt_use_pka', 'delete_untag', 'digest_collapse', 'duplicate_threads', 'edit_headers', \ 'encode_from', 'fast_reply', 'fcc_before_send', 'fcc_clear', 'flag_safe', 'followup_to', \ 'force_name', 'forward_decode', 'forward_decrypt', 'forward_quote', 'forward_references', @@ -433,51 +439,52 @@ \ 'history_remove_dups', 'honor_disposition', 'idn_decode', 'idn_encode', \ 'ignore_list_reply_to', 'imap_check_subscribed', 'imap_condstore', 'imap_deflate', \ 'imap_idle', 'imap_list_subscribed', 'imap_passive', 'imap_peek', 'imap_qresync', - \ 'imap_rfc5161', 'imap_server_noise', 'imap_servernoise', 'implicit_autoview', 'include_encrypted', - \ 'include_only_first', 'include_onlyfirst', 'keep_flagged', 'mailcap_sanitize', 'maildir_check_cur', - \ 'maildir_header_cache_verify', 'maildir_trash', 'mail_check_recent', 'mail_check_stats', - \ 'markers', 'mark_old', 'menu_move_off', 'menu_scroll', 'message_cache_clean', 'meta_key', - \ 'me_too', 'metoo', 'mh_purge', 'mime_forward_decode', 'mime_subject', 'mime_type_query_first', - \ 'narrow_tree', 'nm_record', 'nntp_listgroup', 'nntp_load_description', 'pager_stop', - \ 'pgp_auto_inline', 'pgp_autoinline', 'pgp_auto_decode', 'pgp_check_exit', 'pgp_check_gpg_decrypt_status_fd', - \ 'pgp_ignore_subkeys', 'pgp_long_ids', 'pgp_reply_inline', 'pgp_replyinline', 'pgp_retainable_sigs', + \ 'imap_rfc5161', 'imap_server_noise', 'implicit_autoview', 'include_encrypted', + \ 'include_only_first', 'keep_flagged', 'local_date_header', 'mailcap_sanitize', + \ 'maildir_check_cur', 'maildir_header_cache_verify', 'maildir_trash', 'mail_check_recent', + \ 'mail_check_stats', 'markers', 'mark_old', 'menu_move_off', 'menu_scroll', + \ 'message_cache_clean', 'meta_key', 'me_too', 'mh_purge', 'mime_forward_decode', + \ 'mime_type_query_first', 'narrow_tree', 'nm_query_window_enable', 'nm_record', + \ 'nntp_listgroup', 'nntp_load_description', 'pager_stop', 'pgp_auto_decode', + \ 'pgp_auto_inline', 'pgp_check_exit', 'pgp_check_gpg_decrypt_status_fd', + \ 'pgp_ignore_subkeys', 'pgp_long_ids', 'pgp_reply_inline', 'pgp_retainable_sigs', \ 'pgp_self_encrypt', 'pgp_show_unusable', 'pgp_strict_enc', 'pgp_use_gpg_agent', - \ 'pipe_decode', 'pipe_split', 'pop_auth_try_all', 'pop_last', 'postpone_encrypt', - \ 'print_decode', 'print_split', 'prompt_after', 'read_only', 'reflow_space_quotes', - \ 'reflow_text', 'reply_self', 'reply_with_xorig', 'resolve', 'resume_draft_files', - \ 'resume_edited_draft_files', 'reverse_alias', 'reverse_name', 'reverse_realname', - \ 'rfc2047_parameters', 'save_address', 'save_empty', 'save_name', 'save_unsubscribed', - \ 'score', 'show_new_news', 'show_only_unread', 'sidebar_folder_indent', - \ 'sidebar_new_mail_only', 'sidebar_next_new_wrap', 'sidebar_non_empty_mailbox_only', - \ 'sidebar_on_right', 'sidebar_short_path', 'sidebar_visible', 'sig_dashes', 'sig_on_top', - \ 'size_show_bytes', 'size_show_fractions', 'size_show_mb', 'size_units_on_left', - \ 'smart_wrap', 'smime_ask_cert_label', 'smime_decrypt_use_default_key', 'smime_is_default', - \ 'smime_self_encrypt', 'sort_re', 'ssl_force_tls', 'ssl_use_system_certs', 'ssl_usesystemcerts', 'ssl_use_sslv2', - \ 'ssl_use_sslv3', 'ssl_use_tlsv1', 'ssl_use_tlsv1_1', 'ssl_use_tlsv1_2', 'ssl_use_tlsv1_3', + \ 'pipe_decode', 'pipe_decode_weed', 'pipe_split', 'pop_auth_try_all', 'pop_last', + \ 'postpone_encrypt', 'print_decode', 'print_decode_weed', 'print_split', 'prompt_after', + \ 'read_only', 'reflow_space_quotes', 'reflow_text', 'reply_self', 'reply_with_xorig', + \ 'resolve', 'resume_draft_files', 'resume_edited_draft_files', 'reverse_alias', + \ 'reverse_name', 'reverse_real_name', 'rfc2047_parameters', 'save_address', 'save_empty', + \ 'save_name', 'save_unsubscribed', 'score', 'show_new_news', 'show_only_unread', + \ 'sidebar_folder_indent', 'sidebar_new_mail_only', 'sidebar_next_new_wrap', + \ 'sidebar_non_empty_mailbox_only', 'sidebar_on_right', 'sidebar_short_path', + \ 'sidebar_visible', 'sig_dashes', 'sig_on_top', 'size_show_bytes', 'size_show_fractions', + \ 'size_show_mb', 'size_units_on_left', 'smart_wrap', 'smime_ask_cert_label', + \ 'smime_decrypt_use_default_key', 'smime_is_default', 'smime_self_encrypt', 'sort_re', + \ 'ssl_force_tls', 'ssl_use_sslv2', 'ssl_use_sslv3', 'ssl_use_system_certs', + \ 'ssl_use_tlsv1', 'ssl_use_tlsv1_1', 'ssl_use_tlsv1_2', 'ssl_use_tlsv1_3', \ 'ssl_verify_dates', 'ssl_verify_host', 'ssl_verify_partial_chains', 'status_on_top', \ 'strict_threads', 'suspend', 'text_flowed', 'thorough_search', 'thread_received', 'tilde', - \ 'ts_enabled', 'uncollapse_jump', 'uncollapse_new', 'user_agent', 'use_8bit_mime', 'use_8bitmime', - \ 'use_domain', 'use_envelope_from', 'use_from', 'use_ipv6', 'virtual_spool_file', 'virtual_spoolfile', - \ 'wait_key', 'weed', 'wrap_search', 'write_bcc', 'x_comment_to' + \ 'ts_enabled', 'tunnel_is_secure', 'uncollapse_jump', 'uncollapse_new', 'user_agent', + \ 'use_8bit_mime', 'use_domain', 'use_envelope_from', 'use_from', 'use_ipv6', + \ 'virtual_spool_file', 'wait_key', 'weed', 'wrap_search', 'write_bcc', 'x_comment_to' \ ], 0) -" CHECKED 2020-06-21 +" CHECKED 2022-04-08 " Deprecated Bools " List of DT_SYNONYM or DT_DEPRECATED Bools in MuttVars in mutt_config.c call s:boolQuadGen('Bool', [ - \ 'askbcc', 'askcc', 'autoedit', 'confirmappend', 'confirmcreate', - \ 'crypt_autoencrypt', 'crypt_autopgp', 'crypt_autosign', 'crypt_autosmime', - \ 'crypt_confirmhook', 'crypt_replyencrypt', 'crypt_replysign', - \ 'crypt_replysignencrypted', 'edit_hdrs', 'envelope_from', 'forw_decode', - \ 'forw_decrypt', 'forw_quote', 'header_cache_compress', - \ 'ignore_linear_white_space', 'imap_servernoise', 'include_onlyfirst', - \ 'pgp_autoencrypt', 'pgp_autoinline', 'pgp_autosign', 'pgp_auto_traditional', - \ 'pgp_create_traditional', 'pgp_replyencrypt', 'pgp_replyinline', - \ 'pgp_replysign', 'pgp_replysignencrypted', 'ssl_usesystemcerts', + \ 'askbcc', 'askcc', 'autoedit', 'confirmappend', 'confirmcreate', 'crypt_autoencrypt', + \ 'crypt_autopgp', 'crypt_autosign', 'crypt_autosmime', 'crypt_confirmhook', + \ 'crypt_replyencrypt', 'crypt_replysign', 'crypt_replysignencrypted', 'edit_hdrs', + \ 'envelope_from', 'forw_decode', 'forw_decrypt', 'forw_quote', 'header_cache_compress', + \ 'ignore_linear_white_space', 'imap_servernoise', 'include_onlyfirst', 'metoo', + \ 'mime_subject', 'pgp_autoencrypt', 'pgp_autoinline', 'pgp_autosign', + \ 'pgp_auto_traditional', 'pgp_create_traditional', 'pgp_replyencrypt', 'pgp_replyinline', + \ 'pgp_replysign', 'pgp_replysignencrypted', 'reverse_realname', 'ssl_usesystemcerts', \ 'use_8bitmime', 'virtual_spoolfile', 'xterm_set_titles' \ ], 1) -" CHECKED 2020-06-21 +" CHECKED 2022-04-08 " List of DT_QUAD in MuttVars in mutt_config.c call s:boolQuadGen('Quad', [ \ 'abort_noattach', 'abort_nosubject', 'abort_unmodified', 'bounce', 'catchup_newsgroup', @@ -487,32 +494,32 @@ \ 'post_moderated', 'print', 'quit', 'recall', 'reply_to', 'ssl_starttls', \ ], 0) -" CHECKED 2020-06-21 +" CHECKED 2022-04-08 " Deprecated Quads " List of DT_SYNONYM or DT_DEPRECATED Quads in MuttVars in mutt_config.c call s:boolQuadGen('Quad', [ \ 'mime_fwd', 'pgp_encrypt_self', 'pgp_verify_sig', 'smime_encrypt_self' \ ], 1) -" CHECKED 2020-06-21 +" CHECKED 2022-04-08 " List of DT_NUMBER or DT_LONG in MuttVars in mutt_config.c syntax keyword muttrcVarNum skipwhite contained - \ connect_timeout debug_level header_cache_compress_level history - \ imap_fetch_chunk_size imap_keepalive imap_pipeline_depth imap_poll_timeout mail_check - \ mail_check_stats_interval menu_context net_inc nm_db_limit nm_open_timeout - \ nm_query_window_current_position nm_query_window_duration nntp_context nntp_poll - \ pager_context pager_index_lines pgp_timeout pop_check_interval pop_checkinterval read_inc reflow_wrap - \ save_history score_threshold_delete score_threshold_flag score_threshold_read - \ search_context sendmail_wait sidebar_component_depth sidebar_width skip_quoted_offset - \ sleep_time smime_timeout ssl_min_dh_prime_bits timeout time_inc toggle_quoted_show_levels - \ wrap wrap_headers write_inc + \ connect_timeout debug_level header_cache_compress_level history imap_fetch_chunk_size + \ imap_keepalive imap_pipeline_depth imap_poll_timeout mail_check mail_check_stats_interval + \ menu_context net_inc nm_db_limit nm_open_timeout nm_query_window_current_position + \ nm_query_window_duration nntp_context nntp_poll pager_context pager_index_lines + \ pager_read_delay pager_skip_quoted_context pgp_timeout pop_check_interval read_inc + \ reflow_wrap save_history score_threshold_delete score_threshold_flag score_threshold_read + \ search_context sendmail_wait sidebar_component_depth sidebar_width sleep_time + \ smime_timeout ssl_min_dh_prime_bits timeout time_inc toggle_quoted_show_levels wrap + \ wrap_headers write_inc \ nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr +" CHECKED 2022-04-08 +" Deprecated Numbers syntax keyword muttrcVarDeprecatedNum contained skipwhite - \ header_cache_pagesize wrapmargin pgp_clearsign_command pgp_getkeys_command - \ realname spoolfile - \ nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr + \ header_cache_pagesize pop_checkinterval skip_quoted_offset -" CHECKED 2020-06-21 +" CHECKED 2022-04-08 " List of DT_STRING in MuttVars in mutt_config.c " Special cases first, and all the rest at the end " Formats themselves must be updated in their respective groups @@ -524,19 +531,19 @@ syntax keyword muttrcVarStr contained skipwhite folder_format vfolder_format nextgroup=muttrcVarEqualsFolderFmt syntax keyword muttrcVarStr contained skipwhite attribution forward_format index_format message_format pager_format nextgroup=muttrcVarEqualsIdxFmt syntax keyword muttrcVarStr contained skipwhite mix_entry_format nextgroup=muttrcVarEqualsMixFmt +syntax keyword muttrcVarStr contained skipwhite pattern_format nextgroup=muttrcVarEqualsPatternFmt syntax keyword muttrcVarStr contained skipwhite - \ pgp_clear_sign_command pgp_clearsign_command pgp_decode_command pgp_decrypt_command - \ pgp_encrypt_only_command pgp_encrypt_sign_command pgp_export_command pgp_get_keys_command pgp_getkeys_command - \ pgp_import_command pgp_list_pubring_command pgp_list_secring_command - \ pgp_sign_command pgp_verify_command pgp_verify_key_command + \ pgp_clear_sign_command pgp_decode_command pgp_decrypt_command pgp_encrypt_only_command + \ pgp_encrypt_sign_command pgp_export_command pgp_get_keys_command pgp_import_command + \ pgp_list_pubring_command pgp_list_secring_command pgp_sign_command pgp_verify_command + \ pgp_verify_key_command \ nextgroup=muttrcVarEqualsPGPCmdFmt syntax keyword muttrcVarStr contained skipwhite pgp_entry_format nextgroup=muttrcVarEqualsPGPFmt syntax keyword muttrcVarStr contained skipwhite query_format nextgroup=muttrcVarEqualsQueryFmt syntax keyword muttrcVarStr contained skipwhite \ smime_decrypt_command smime_encrypt_command smime_get_cert_command - \ smime_get_cert_email_command smime_get_signer_cert_command - \ smime_import_cert_command smime_pk7out_command smime_sign_command - \ smime_verify_command smime_verify_opaque_command + \ smime_get_cert_email_command smime_get_signer_cert_command smime_import_cert_command + \ smime_pk7out_command smime_sign_command smime_verify_command smime_verify_opaque_command \ nextgroup=muttrcVarEqualsSmimeFmt syntax keyword muttrcVarStr contained skipwhite status_format ts_icon_format ts_status_format nextgroup=muttrcVarEqualsStatusFmt syntax keyword muttrcVarStr contained skipwhite date_format nextgroup=muttrcVarEqualsStrftimeFmt @@ -545,64 +552,66 @@ syntax keyword muttrcVarStr contained skipwhite \ abort_key arrow_string assumed_charset attach_charset attach_sep attribution_locale \ autocrypt_acct_format charset config_charset content_type crypt_protected_headers_subject - \ default_hook dsn_notify dsn_return empty_subject escape forward_attribution_intro - \ forward_attribution_trailer header_cache_backend header_cache_compress_method hidden_tags - \ hostname imap_authenticators imap_delim_chars imap_headers imap_login imap_pass imap_user - \ indent_string mailcap_path mark_macro_prefix mh_seq_flagged mh_seq_replied mh_seq_unseen - \ newsgroups_charset news_server nm_default_url nm_exclude_tags nm_flagged_tag nm_query_type - \ nm_query_window_current_search nm_query_window_timebase nm_record_tags nm_replied_tag - \ nm_unread_tag nntp_authenticators nntp_pass nntp_user pgp_default_key pgp_sign_as pipe_sep - \ pop_authenticators pop_host pop_pass pop_user postpone_encrypt_as post_indent_string - \ preconnect preferred_languages real_name realname send_charset show_multipart_alternative - \ sidebar_delim_chars sidebar_divider_char sidebar_indent_string simple_search - \ smime_default_key smime_encrypt_with smime_sign_as smime_sign_digest_alg - \ smtp_authenticators smtp_pass smtp_url smtp_user spam_separator ssl_ciphers + \ default_hook dsn_notify dsn_return empty_subject forward_attribution_intro + \ forward_attribution_trailer greeting header_cache_backend header_cache_compress_method + \ hidden_tags hostname imap_authenticators imap_delim_chars imap_headers imap_login + \ imap_pass imap_user indent_string mailcap_path mark_macro_prefix mh_seq_flagged + \ mh_seq_replied mh_seq_unseen newsgroups_charset news_server nm_default_url nm_exclude_tags + \ nm_flagged_tag nm_query_type nm_query_window_current_search nm_query_window_or_terms + \ nm_query_window_timebase nm_record_tags nm_replied_tag nm_unread_tag nntp_authenticators + \ nntp_pass nntp_user pgp_default_key pgp_sign_as pipe_sep pop_authenticators pop_host + \ pop_pass pop_user postpone_encrypt_as post_indent_string preconnect preferred_languages + \ real_name send_charset show_multipart_alternative sidebar_delim_chars sidebar_divider_char + \ sidebar_indent_string simple_search smime_default_key smime_encrypt_with smime_sign_as + \ smime_sign_digest_alg smtp_authenticators smtp_pass smtp_url smtp_user spam_separator + \ ssl_ciphers \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr " Deprecated strings syntax keyword muttrcVarDeprecatedStr - \ abort_noattach_regexp attach_keyword forw_format hdr_format indent_str msg_format - \ nm_default_uri pop_checkinterval pgp_self_encrypt_as post_indent_str print_cmd quote_regexp reply_regexp - \ smime_self_encrypt_as xterm_icon xterm_title + \ abort_noattach_regexp attach_keyword escape forw_format hdr_format indent_str msg_format + \ nm_default_uri pgp_clearsign_command pgp_getkeys_command pgp_self_encrypt_as + \ post_indent_str print_cmd quote_regexp realname reply_regexp smime_self_encrypt_as + \ spoolfile visual xterm_icon xterm_title -" CHECKED 2020-06-21 +" CHECKED 2022-04-08 " List of DT_ADDRESS syntax keyword muttrcVarStr contained skipwhite envelope_from_address from nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr " List of DT_ENUM -syntax keyword muttrcVarStr contained skipwhite mbox_type nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr +syntax keyword muttrcVarStr contained skipwhite mbox_type use_threads nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr " List of DT_MBTABLE syntax keyword muttrcVarStr contained skipwhite crypt_chars flag_chars from_chars status_chars to_chars nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr -" CHECKED 2020-06-21 -" List of DT_PATH +" CHECKED 2022-04-08 +" List of DT_PATH or DT_MAILBOX syntax keyword muttrcVarStr contained skipwhite \ alias_file attach_save_dir autocrypt_dir certificate_file debug_file \ entropy_file folder header_cache history_file mbox message_cachedir newsrc \ news_cache_dir postponed record signature smime_ca_location - \ smime_certificates smime_keys spool_file spoolfile ssl_ca_certificates_file - \ ssl_client_cert tmpdir trash + \ smime_certificates smime_keys spool_file ssl_ca_certificates_file ssl_client_cert + \ tmpdir trash \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr " List of DT_COMMAND (excluding pgp_*_command and smime_*_command) syntax keyword muttrcVarStr contained skipwhite \ display_filter editor inews ispell mixmaster new_mail_command pager - \ print_command query_command sendmail shell visual external_search_command + \ print_command query_command sendmail shell external_search_command \ imap_oauth_refresh_command pop_oauth_refresh_command \ mime_type_query_command smtp_oauth_refresh_command tunnel \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr -" CHECKED 2020-06-21 +" CHECKED 2022-04-08 " List of DT_REGEX syntax keyword muttrcVarStr contained skipwhite - \ abort_noattach_regex gecos_mask mask pgp_decryption_okay pgp_good_sign - \ quote_regex reply_regex smileys + \ abort_noattach_regex gecos_mask mask pgp_decryption_okay pgp_good_sign quote_regex + \ reply_regex smileys \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr " List of DT_SORT syntax keyword muttrcVarStr contained skipwhite \ pgp_sort_keys sidebar_sort_method sort sort_alias sort_aux sort_browser \ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr -" CHECKED 2020-06-21 -" List of commands in Commands in mutt_config.c +" CHECKED 2022-04-08 +" List of commands in mutt_commands in mutt_commands.c " Remember to remove hooks, they have already been dealt with syntax keyword muttrcCommand skipwhite alias nextgroup=muttrcAliasGroupDef,muttrcAliasKey,muttrcAliasNL syntax keyword muttrcCommand skipwhite bind nextgroup=muttrcBindMenuList,muttrcBindMenuListNL @@ -614,14 +623,12 @@ syntax keyword muttrcCommand skipwhite unalias nextgroup=muttrcUnAliasKey,muttrcUnAliasNL syntax keyword muttrcCommand skipwhite unhook nextgroup=muttrcHooks syntax keyword muttrcCommand skipwhite - \ alternative_order attachments auto_view finish hdr_order ifdef ifndef - \ ignore lua lua-source mailboxes mailto_allow mime_lookup my_hdr push score - \ setenv sidebar_whitelist source subjectrx subscribe-to tag-formats - \ tag-transforms unalternative_order unattachments unauto_view uncolor - \ unhdr_order unignore unmailboxes unmailto_allow unmime_lookup unmono - \ unmy_hdr unscore unsetenv unsidebar_whitelist unsubjectrx unsubscribe-from - \ unvirtual-mailboxes virtual-mailboxes named-mailboxes - \ echo unbind unmacro + \ alternative_order attachments auto_view cd echo finish hdr_order ifdef ifndef ignore lua + \ lua-source mailboxes mailto_allow mime_lookup my_hdr named-mailboxes push score setenv + \ sidebar_whitelist source subjectrx subscribe-to tag-formats tag-transforms + \ unalternative_order unattachments unauto_view unbind uncolor unhdr_order unignore unmacro + \ unmailboxes unmailto_allow unmime_lookup unmono unmy_hdr unscore unsetenv + \ unsidebar_whitelist unsubjectrx unsubscribe-from unvirtual-mailboxes virtual-mailboxes function! s:genFunctions(functions) for f in a:functions @@ -629,66 +636,68 @@ endfor endfunction -" CHECKED 2020-06-21 +" CHECKED 2022-04-08 " List of functions in functions.c " Note: 'noop' is included but is elsewhere in the source call s:genFunctions(['noop', - \ 'accept', 'append', 'attach-file', 'attach-key', 'attach-message', 'attach-news-message', - \ 'autocrypt-acct-menu', 'autocrypt-menu', 'backspace', 'backward-char', 'backward-word', - \ 'bol', 'bottom-page', 'bottom', 'bounce-message', 'break-thread', 'buffy-cycle', - \ 'buffy-list', 'capitalize-word', 'catchup', 'chain-next', 'chain-prev', 'change-dir', - \ 'change-folder-readonly', 'change-folder', 'change-newsgroup-readonly', - \ 'change-newsgroup', 'change-vfolder', 'check-new', 'check-stats', + \ 'accept', 'alias-dialog', 'append', 'attach-file', 'attach-key', 'attach-message', + \ 'attach-news-message', 'autocrypt-acct-menu', 'autocrypt-menu', 'backspace', + \ 'backward-char', 'backward-word', 'bol', 'bottom', 'bottom-page', 'bounce-message', + \ 'break-thread', 'buffy-cycle', 'buffy-list', 'capitalize-word', 'catchup', 'chain-next', + \ 'chain-prev', 'change-dir', 'change-folder', 'change-folder-readonly', 'change-newsgroup', + \ 'change-newsgroup-readonly', 'change-vfolder', 'check-new', 'check-stats', \ 'check-traditional-pgp', 'clear-flag', 'collapse-all', 'collapse-parts', - \ 'collapse-thread', 'complete-query', 'complete', 'compose-to-sender', 'copy-file', + \ 'collapse-thread', 'complete', 'complete-query', 'compose-to-sender', 'copy-file', \ 'copy-message', 'create-account', 'create-alias', 'create-mailbox', 'current-bottom', \ 'current-middle', 'current-top', 'decode-copy', 'decode-save', 'decrypt-copy', - \ 'decrypt-save', 'delete-account', 'delete-char', 'delete-entry', 'delete-mailbox', - \ 'delete-message', 'delete-pattern', 'delete-subthread', 'delete-thread', 'delete', + \ 'decrypt-save', 'delete', 'delete-account', 'delete-char', 'delete-entry', + \ 'delete-mailbox', 'delete-message', 'delete-pattern', 'delete-subthread', 'delete-thread', \ 'descend-directory', 'detach-file', 'display-address', 'display-filename', - \ 'display-message', 'display-toggle-weed', 'downcase-word', 'edit-bcc', 'edit-cc', - \ 'edit-description', 'edit-encoding', 'edit-fcc', 'edit-file', 'edit-followup-to', - \ 'edit-from', 'edit-headers', 'edit-label', 'edit-language', 'edit-message', 'edit-mime', - \ 'edit-newsgroups', 'edit-or-view-raw-message', 'edit-raw-message', 'edit-reply-to', - \ 'edit-subject', 'edit-to', 'edit-type', 'edit-x-comment-to', 'edit', 'end-cond', - \ 'enter-command', 'enter-mask', 'entire-thread', 'eol', 'exit', 'extract-keys', - \ 'fetch-mail', 'filter-entry', 'first-entry', 'flag-message', 'followup-message', - \ 'forget-passphrase', 'forward-char', 'forward-message', 'forward-to-group', - \ 'forward-word', 'get-attachment', 'get-children', 'get-message', 'get-parent', - \ 'goto-folder', 'goto-parent', 'group-alternatives', 'group-chat-reply', - \ 'group-multilingual', 'group-reply', 'half-down', 'half-up', 'help', 'history-down', - \ 'history-search', 'history-up', 'imap-fetch-mail', 'imap-logout-all', 'insert', 'ispell', - \ 'jump', 'kill-eol', 'kill-eow', 'kill-line', 'kill-word', 'last-entry', - \ 'limit-current-thread', 'limit', 'link-threads', 'list-reply', 'mail-key', - \ 'mailbox-cycle', 'mailbox-list', 'mail', 'mark-as-new', 'mark-message', 'middle-page', - \ 'mix', 'modify-labels-then-hide', 'modify-labels', 'modify-tags-then-hide', - \ 'modify-tags', 'move-down', 'move-up', 'new-mime', 'next-entry', 'next-line', - \ 'next-new-then-unread', 'next-new', 'next-page', 'next-subthread', 'next-thread', - \ 'next-undeleted', 'next-unread-mailbox', 'next-unread', 'parent-message', 'pgp-menu', - \ 'pipe-entry', 'pipe-message', 'post-message', 'postpone-message', 'previous-entry', - \ 'previous-line', 'previous-new-then-unread', 'previous-new', 'previous-page', - \ 'previous-subthread', 'previous-thread', 'previous-undeleted', 'previous-unread', - \ 'print-entry', 'print-message', 'purge-message', 'purge-thread', 'quasi-delete', - \ 'query-append', 'query', 'quit', 'quote-char', 'read-subthread', 'read-thread', - \ 'recall-message', 'reconstruct-thread', 'redraw-screen', 'refresh', 'reload-active', - \ 'rename-attachment', 'rename-file', 'rename-mailbox', 'reply', 'resend-message', - \ 'root-message', 'save-entry', 'save-message', 'search-next', 'search-opposite', - \ 'search-reverse', 'search-toggle', 'search', 'select-entry', 'select-new', + \ 'display-message', 'display-toggle-weed', 'downcase-word', 'edit', 'edit-bcc', 'edit-cc', + \ 'edit-content-id', 'edit-description', 'edit-encoding', 'edit-fcc', 'edit-file', + \ 'edit-followup-to', 'edit-from', 'edit-headers', 'edit-label', 'edit-language', + \ 'edit-message', 'edit-mime', 'edit-newsgroups', 'edit-or-view-raw-message', + \ 'edit-raw-message', 'edit-reply-to', 'edit-subject', 'edit-to', 'edit-type', + \ 'edit-x-comment-to', 'end-cond', 'enter-command', 'enter-mask', 'entire-thread', 'eol', + \ 'error-history', 'exit', 'extract-keys', 'fetch-mail', 'filter-entry', 'first-entry', + \ 'flag-message', 'followup-message', 'forget-passphrase', 'forward-char', + \ 'forward-message', 'forward-to-group', 'forward-word', 'get-attachment', 'get-children', + \ 'get-message', 'get-parent', 'goto-folder', 'goto-parent', 'group-alternatives', + \ 'group-chat-reply', 'group-multilingual', 'group-related', 'group-reply', 'half-down', + \ 'half-up', 'help', 'history-down', 'history-search', 'history-up', 'imap-fetch-mail', + \ 'imap-logout-all', 'insert', 'ispell', 'jump', 'kill-eol', 'kill-eow', 'kill-line', + \ 'kill-word', 'last-entry', 'limit', 'limit-current-thread', 'link-threads', 'list-reply', + \ 'list-subscribe', 'list-unsubscribe', 'mail', 'mail-key', 'mailbox-cycle', 'mailbox-list', + \ 'mark-as-new', 'mark-message', 'middle-page', 'mix', 'modify-labels', + \ 'modify-labels-then-hide', 'modify-tags', 'modify-tags-then-hide', 'move-down', 'move-up', + \ 'new-mime', 'next-entry', 'next-line', 'next-new', 'next-new-then-unread', 'next-page', + \ 'next-subthread', 'next-thread', 'next-undeleted', 'next-unread', 'next-unread-mailbox', + \ 'parent-message', 'pgp-menu', 'pipe-entry', 'pipe-message', 'post-message', + \ 'postpone-message', 'previous-entry', 'previous-line', 'previous-new', + \ 'previous-new-then-unread', 'previous-page', 'previous-subthread', 'previous-thread', + \ 'previous-undeleted', 'previous-unread', 'print-entry', 'print-message', 'purge-message', + \ 'purge-thread', 'quasi-delete', 'query', 'query-append', 'quit', 'quote-char', + \ 'read-subthread', 'read-thread', 'recall-message', 'reconstruct-thread', 'redraw-screen', + \ 'refresh', 'reload-active', 'rename-attachment', 'rename-file', 'rename-mailbox', 'reply', + \ 'resend-message', 'root-message', 'save-entry', 'save-message', 'search', 'search-next', + \ 'search-opposite', 'search-reverse', 'search-toggle', 'select-entry', 'select-new', \ 'send-message', 'set-flag', 'shell-escape', 'show-limit', 'show-log-messages', - \ 'show-version', 'sidebar-next-new', 'sidebar-first', 'sidebar-last', 'sidebar-next', - \ 'sidebar-open', 'sidebar-page-down', 'sidebar-page-up', 'sidebar-prev-new', - \ 'sidebar-prev', 'sidebar-toggle-virtual', 'sidebar-toggle-visible', 'skip-quoted', - \ 'smime-menu', 'sort-mailbox', 'sort-reverse', 'sort', 'subscribe-pattern', - \ 'sync-mailbox', 'tag-entry', 'tag-message', 'tag-pattern', 'tag-prefix-cond', - \ 'tag-prefix', 'tag-subthread', 'tag-thread', 'toggle-active', 'toggle-disposition', - \ 'toggle-mailboxes', 'toggle-new', 'toggle-prefer-encrypt', 'toggle-quoted', - \ 'toggle-read', 'toggle-recode', 'toggle-subscribed', 'toggle-unlink', 'toggle-write', - \ 'top-page', 'top', 'transpose-chars', 'uncatchup', 'undelete-entry', 'undelete-message', - \ 'undelete-pattern', 'undelete-subthread', 'undelete-thread', 'unsubscribe-pattern', - \ 'untag-pattern', 'upcase-word', 'update-encoding', 'verify-key', - \ 'vfolder-from-query-readonly', 'vfolder-from-query', 'vfolder-window-backward', - \ 'vfolder-window-forward', 'view-attachments', 'view-attach', 'view-file', 'view-mailcap', - \ 'view-name', 'view-raw-message', 'view-text', 'what-key', 'write-fcc' + \ 'show-version', 'sidebar-first', 'sidebar-last', 'sidebar-next', 'sidebar-next-new', + \ 'sidebar-open', 'sidebar-page-down', 'sidebar-page-up', 'sidebar-prev', + \ 'sidebar-prev-new', 'sidebar-toggle-virtual', 'sidebar-toggle-visible', 'skip-headers', + \ 'skip-quoted', 'smime-menu', 'sort', 'sort-alias', 'sort-alias-reverse', 'sort-mailbox', + \ 'sort-reverse', 'subscribe', 'subscribe-pattern', 'sync-mailbox', 'tag-entry', + \ 'tag-message', 'tag-pattern', 'tag-prefix', 'tag-prefix-cond', 'tag-subthread', + \ 'tag-thread', 'toggle-active', 'toggle-disposition', 'toggle-mailboxes', 'toggle-new', + \ 'toggle-prefer-encrypt', 'toggle-quoted', 'toggle-read', 'toggle-recode', + \ 'toggle-subscribed', 'toggle-unlink', 'toggle-write', 'top', 'top-page', + \ 'transpose-chars', 'uncatchup', 'undelete-entry', 'undelete-message', 'undelete-pattern', + \ 'undelete-subthread', 'undelete-thread', 'ungroup-attachment', 'unsubscribe', + \ 'unsubscribe-pattern', 'untag-pattern', 'upcase-word', 'update-encoding', 'verify-key', + \ 'vfolder-from-query', 'vfolder-from-query-readonly', 'vfolder-window-backward', + \ 'vfolder-window-forward', 'vfolder-window-reset', 'view-attach', 'view-attachments', + \ 'view-file', 'view-mailcap', 'view-name', 'view-pager', 'view-raw-message', 'view-text', + \ 'what-key', 'write-fcc' \ ]) " Define the default highlighting. @@ -765,6 +774,7 @@ highlight def link muttrcGroupIndexFormatEscapes muttrcEscape highlight def link muttrcIndexFormatEscapes muttrcEscape highlight def link muttrcMixFormatEscapes muttrcEscape +highlight def link muttrcPatternFormatEscapes muttrcEscape highlight def link muttrcPGPCmdFormatEscapes muttrcEscape highlight def link muttrcPGPFormatEscapes muttrcEscape highlight def link muttrcPGPTimeEscapes muttrcEscape @@ -781,6 +791,7 @@ highlight def link muttrcFolderFormatConditionals muttrcFormatConditionals2 highlight def link muttrcIndexFormatConditionals muttrcFormatConditionals2 highlight def link muttrcMixFormatConditionals muttrcFormatConditionals2 +highlight def link muttrcPatternFormatConditionals muttrcFormatConditionals2 highlight def link muttrcPGPCmdFormatConditionals muttrcFormatConditionals2 highlight def link muttrcPGPFormatConditionals muttrcFormatConditionals2 highlight def link muttrcSmimeFormatConditionals muttrcFormatConditionals2 @@ -796,6 +807,7 @@ highlight def link muttrcGroupIndexFormatStr muttrcString highlight def link muttrcIndexFormatStr muttrcString highlight def link muttrcMixFormatStr muttrcString +highlight def link muttrcPatternFormatStr muttrcString highlight def link muttrcPGPCmdFormatStr muttrcString highlight def link muttrcPGPFormatStr muttrcString highlight def link muttrcQueryFormatStr muttrcString ++++++ neomutt.vim.obsinfo ++++++ --- /var/tmp/diff_new_pack.Y9Sedd/_old 2022-08-12 16:07:29.279622342 +0200 +++ /var/tmp/diff_new_pack.Y9Sedd/_new 2022-08-12 16:07:29.283622353 +0200 @@ -1,5 +1,5 @@ name: neomutt.vim -version: 20210218 -mtime: 1613614995 -commit: 15b06057a75e5b648b1c1c692c870bc7f052d0c9 +version: 20220612 +mtime: 1655060512 +commit: 4f87a1e1fa3e4b343558594f3b5490cd028b8718 ++++++ vim-latex-1.10.0+20210818.obscpio -> vim-latex-1.10.0+20220519.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-latex-1.10.0+20210818/ftplugin/latex-suite/folding.vim new/vim-latex-1.10.0+20220519/ftplugin/latex-suite/folding.vim --- old/vim-latex-1.10.0+20210818/ftplugin/latex-suite/folding.vim 2021-08-18 09:30:26.000000000 +0200 +++ new/vim-latex-1.10.0+20220519/ftplugin/latex-suite/folding.vim 2022-05-19 20:02:49.000000000 +0200 @@ -297,7 +297,7 @@ " In other words, the pattern is safe, but not exact. call AddSyntaxFoldItem('^\s*\\'.s.'{[^{}]*$','^[^}]*}',0,0) else - if s =~ 'itemize\|enumerate\|description' + if s =~ 'itemize\|enumerate\|description\|align\|gather' " These environments can nest. call AddSyntaxFoldItem('^\s*\\begin{'.s,'\(^\|\s\)\s*\\end{'.s,0,0,'^\s*\\begin{'.s,'\(^\|\s\)\s*\\end{'.s) else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-latex-1.10.0+20210818/ftplugin/latex-suite/texviewer.vim new/vim-latex-1.10.0+20220519/ftplugin/latex-suite/texviewer.vim --- old/vim-latex-1.10.0+20210818/ftplugin/latex-suite/texviewer.vim 2021-08-18 09:30:26.000000000 +0200 +++ new/vim-latex-1.10.0+20220519/ftplugin/latex-suite/texviewer.vim 2022-05-19 20:02:49.000000000 +0200 @@ -381,7 +381,7 @@ let bibkey = matchstr(getline('.'), '\\bibitem\s*\%(\[.\{-}\]\)\?\s*{\zs.\{-}\ze}') if bibkey == "" " Look for a '@article{bibkey,' - let bibkey = matchstr(getline('.'), '@\w*{\zs\w*\ze,') + let bibkey = matchstr(getline('.'), '@\w*{\zs.*\ze,') endif let completeword = bibkey ++++++ vim-latex.obsinfo ++++++ --- /var/tmp/diff_new_pack.Y9Sedd/_old 2022-08-12 16:07:29.455622871 +0200 +++ /var/tmp/diff_new_pack.Y9Sedd/_new 2022-08-12 16:07:29.459622883 +0200 @@ -1,5 +1,5 @@ name: vim-latex -version: 1.10.0+20210818 -mtime: 1629271826 -commit: 0760891c71e4c332d0b07704f2356bc4f56a7128 +version: 1.10.0+20220519 +mtime: 1652983369 +commit: 069a26a0963adb6a9de9f40f5a7332c7207d5423 ++++++ vim-markdown-2.0.0+20220129.obscpio -> vim-markdown-2.0.0+20220507.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/.github/workflows/reviewdog.yml new/vim-markdown-2.0.0+20220507/.github/workflows/reviewdog.yml --- old/vim-markdown-2.0.0+20220129/.github/workflows/reviewdog.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/.github/workflows/reviewdog.yml 2022-05-07 13:25:06.000000000 +0200 @@ -0,0 +1,13 @@ +name: Reviewdog +on: [pull_request] +jobs: + vint: + name: vint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: vint + uses: reviewdog/action-vint@v1 + with: + github_token: ${{ secrets.github_token }} + reporter: github-pr-review diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/.github/workflows/vader.yml new/vim-markdown-2.0.0+20220507/.github/workflows/vader.yml --- old/vim-markdown-2.0.0+20220129/.github/workflows/vader.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/.github/workflows/vader.yml 2022-05-07 13:25:06.000000000 +0200 @@ -0,0 +1,31 @@ +name: Vader +on: [push, pull_request] +jobs: + vader: + name: vader + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + vimFlavor: ["vim", "nvim"] + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Enable Universe package repository + run: | + sudo add-apt-repository universe + sudo apt-get update + - name: Install ${{ matrix.vimFlavor }} + run: | + sudo apt-get install ${{ matrix.vimFlavor == 'nvim' && 'neovim' || 'vim' }} + - name: Review versions + run: | + ${{ matrix.vimFlavor }} --version + - name: Fetch Vader and other dependencies + run: | + make build/tabular build/vim-toml build/vim-json build/vader.vim + - name: Run test suite + run: | + cd test + ${{ matrix.vimFlavor == 'nvim' && 'nvim --headless' || 'vim -N' }} \ + -u vimrc "+Vader! *" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/.github/workflows/vint.yml new/vim-markdown-2.0.0+20220507/.github/workflows/vint.yml --- old/vim-markdown-2.0.0+20220129/.github/workflows/vint.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/.github/workflows/vint.yml 2022-05-07 13:25:06.000000000 +0200 @@ -0,0 +1,15 @@ +name: Vint +on: [push] +jobs: + vint: + name: vint + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + - name: Setup dependencies + run: pip install vim-vint + - name: Lint Vimscript + run: vint . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/.vintrc.yaml new/vim-markdown-2.0.0+20220507/.vintrc.yaml --- old/vim-markdown-2.0.0+20220129/.vintrc.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/.vintrc.yaml 2022-05-07 13:25:06.000000000 +0200 @@ -0,0 +1,5 @@ +cmdargs: + severity: style_problem + color: true + env: + neovim: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/README.md new/vim-markdown-2.0.0+20220507/README.md --- old/vim-markdown-2.0.0+20220129/README.md 2022-01-29 12:20:11.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/README.md 2022-05-07 13:25:06.000000000 +0200 @@ -1,5 +1,8 @@ # Vim Markdown +[](https://github.com/preservim/vim-markdown/actions?workflow=Vint) +[](https://github.com/preservim/vim-markdown/actions?workflow=Vader) + Syntax highlighting, matching rules and mappings for [the original Markdown](http://daringfireball.net/projects/markdown/) and extensions. 1. [Installation](#installation) @@ -441,7 +444,7 @@ The main contributors of vim-markdown are: -- **Ben Williams** (A.K.A. @plasticboy). The original developer of vim-markdown. [Homepage](http://plasticboy.com/). +- **Ben Williams** (A.K.A. **@plasticboy**). The original developer of vim-markdown. [Homepage](http://plasticboy.com/). If you feel that your name should be on this list, please make a pull request listing your contributions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/after/ftplugin/markdown.vim new/vim-markdown-2.0.0+20220507/after/ftplugin/markdown.vim --- old/vim-markdown-2.0.0+20220129/after/ftplugin/markdown.vim 2022-01-29 12:20:11.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/after/ftplugin/markdown.vim 2022-05-07 13:25:06.000000000 +0200 @@ -9,15 +9,15 @@ function! s:is_mkdCode(lnum) let name = synIDattr(synID(a:lnum, 1, 0), 'name') - return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)') + return (name =~# '^mkd\%(Code$\|Snippet\)' || name !=# '' && name !~? '^\%(mkd\|html\)') endfunction -if get(g:, "vim_markdown_folding_style_pythonic", 0) +if get(g:, 'vim_markdown_folding_style_pythonic', 0) function! Foldexpr_markdown(lnum) let l1 = getline(a:lnum) "~~~~~ keep track of fenced code blocks ~~~~~ "If we hit a code block fence - if l1 =~ '````*' || l1 =~ '\~\~\~\~*' + if l1 =~# '````*' || l1 =~# '\~\~\~\~*' " toggle the variable that says if we're in a code block if b:fenced_block == 0 let b:fenced_block = 1 @@ -30,14 +30,14 @@ if b:front_matter == 1 && a:lnum > 2 let l0 = getline(a:lnum-1) " if the previous line fenced front matter - if l0 == '---' + if l0 ==# '---' " we must not be in front matter let b:front_matter = 0 endif " else, if we're on line one elseif a:lnum == 1 " if we hit a front matter fence - if l1 == '---' + if l1 ==# '---' " we're in the front matter let b:front_matter = 1 endif @@ -45,8 +45,8 @@ endif " if we're in a code block or front matter - if b:fenced_block == 1 || b:front_matter == 1 - if a:lnum == 1 + if b:fenced_block ==# 1 || b:front_matter ==# 1 + if a:lnum ==# 1 " fold any 'preamble' return '>1' else @@ -58,18 +58,19 @@ let l2 = getline(a:lnum+1) " if the next line starts with two or more '=' " and is not code - if l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1) + if l2 =~# '^==\+\s*' && !s:is_mkdCode(a:lnum+1) " next line is underlined (level 1) return '>0' " else, if the nex line starts with two or more '-' + " but is not comment closer (-->) " and is not code - elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1) + elseif l2 =~# '^--\+\s*$' && !s:is_mkdCode(a:lnum+1) " next line is underlined (level 2) return '>1' endif "if we're on a non-code line starting with a pound sign - if l1 =~ '^#' && !s:is_mkdCode(a:lnum) + if l1 =~# '^#' && !s:is_mkdCode(a:lnum) " set the fold level to the number of hashes -1 " return '>'.(matchend(l1, '^#\+') - 1) " set the fold level to the number of hashes @@ -87,13 +88,13 @@ function! Foldtext_markdown() let line = getline(v:foldstart) let has_numbers = &number || &relativenumber - let nucolwidth = &fdc + has_numbers * &numberwidth + let nucolwidth = &foldcolumn + has_numbers * &numberwidth let windowwidth = winwidth(0) - nucolwidth - 6 let foldedlinecount = v:foldend - v:foldstart let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount)) let line = substitute(line, '\%("""\|''''''\)', '', '') let fillcharcount = windowwidth - len(line) - len(foldedlinecount) + 1 - return line . ' ' . repeat("-", fillcharcount) . ' ' . foldedlinecount + return line . ' ' . repeat('-', fillcharcount) . ' ' . foldedlinecount endfunction else " vim_markdown_folding_style_pythonic == 0 function! Foldexpr_markdown(lnum) @@ -104,7 +105,7 @@ endif " keep track of fenced code blocks - if l0 =~ '````*' || l0 =~ '\~\~\~\~*' + if l0 =~# '````*' || l0 =~# '\~\~\~\~*' if b:fenced_block == 0 let b:fenced_block = 1 elseif b:fenced_block == 1 @@ -112,11 +113,11 @@ endif elseif g:vim_markdown_frontmatter == 1 if b:front_matter == 1 - if l0 == '---' + if l0 ==# '---' let b:front_matter = 0 endif elseif a:lnum == 2 - if l0 == '---' + if l0 ==# '---' let b:front_matter = 1 endif endif @@ -128,10 +129,10 @@ endif let l2 = getline(a:lnum+1) - if l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1) + if l2 =~# '^==\+\s*' && !s:is_mkdCode(a:lnum+1) " next line is underlined (level 1) return '>1' - elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1) + elseif l2 =~# '^--\+\s*$' && !s:is_mkdCode(a:lnum+1) " next line is underlined (level 2) if s:vim_markdown_folding_level >= 2 return '>1' @@ -141,7 +142,7 @@ endif let l1 = getline(a:lnum) - if l1 =~ '^#' && !s:is_mkdCode(a:lnum) + if l1 =~# '^#' && !s:is_mkdCode(a:lnum) " fold level according to option if s:vim_markdown_folding_level == 1 || matchend(l1, '^#\+') > s:vim_markdown_folding_level if a:lnum == line('$') @@ -155,7 +156,7 @@ endif endif - if l0 =~ '^#' && !s:is_mkdCode(a:lnum-1) + if l0 =~# '^#' && !s:is_mkdCode(a:lnum-1) " previous line starts with hashes return '>'.matchend(l0, '^#\+') else @@ -168,12 +169,12 @@ let b:fenced_block = 0 let b:front_matter = 0 -let s:vim_markdown_folding_level = get(g:, "vim_markdown_folding_level", 1) +let s:vim_markdown_folding_level = get(g:, 'vim_markdown_folding_level', 1) function! s:MarkdownSetupFolding() - if !get(g:, "vim_markdown_folding_disabled", 0) - if get(g:, "vim_markdown_folding_style_pythonic", 0) - if get(g:, "vim_markdown_override_foldtext", 1) + if !get(g:, 'vim_markdown_folding_disabled', 0) + if get(g:, 'vim_markdown_folding_style_pythonic', 0) + if get(g:, 'vim_markdown_override_foldtext', 1) setlocal foldtext=Foldtext_markdown() endif endif @@ -183,9 +184,9 @@ endfunction function! s:MarkdownSetupFoldLevel() - if get(g:, "vim_markdown_folding_style_pythonic", 0) + if get(g:, 'vim_markdown_folding_style_pythonic', 0) " set default foldlevel - execute "setlocal foldlevel=".s:vim_markdown_folding_level + execute 'setlocal foldlevel='.s:vim_markdown_folding_level endif endfunction diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/ftdetect/markdown.vim new/vim-markdown-2.0.0+20220507/ftdetect/markdown.vim --- old/vim-markdown-2.0.0+20220129/ftdetect/markdown.vim 2022-01-29 12:20:11.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/ftdetect/markdown.vim 2022-05-07 13:25:06.000000000 +0200 @@ -3,6 +3,6 @@ au! filetypedetect BufRead,BufNewFile *.md endif -" markdown filetype file +" vint: -ProhibitAutocmdWithNoGroup au BufRead,BufNewFile *.{md,mdx,mdown,mkd,mkdn,markdown,mdwn} setfiletype markdown au BufRead,BufNewFile *.{md,mdx,mdown,mkd,mkdn,markdown,mdwn}.{des3,des,bf,bfa,aes,idea,cast,rc2,rc4,rc5,desx} setfiletype markdown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/ftplugin/markdown.vim new/vim-markdown-2.0.0+20220507/ftplugin/markdown.vim --- old/vim-markdown-2.0.0+20220129/ftplugin/markdown.vim 2022-01-29 12:20:11.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/ftplugin/markdown.vim 2022-05-07 13:25:06.000000000 +0200 @@ -94,7 +94,7 @@ " function! s:MoveToCurHeader() let l:lineNum = s:GetHeaderLineNum() - if l:lineNum != 0 + if l:lineNum !=# 0 call cursor(l:lineNum, 1) else echo 'outside any header' @@ -147,7 +147,7 @@ let l:line = a:1 endif let l:linenum = s:GetHeaderLineNum(l:line) - if l:linenum != 0 + if l:linenum !=# 0 return s:GetLevelOfHeaderAtLine(l:linenum) else return 0 @@ -161,13 +161,13 @@ let l:fenced_block = 0 let l:front_matter = 0 let l:header_list = [] - let l:vim_markdown_frontmatter = get(g:, "vim_markdown_frontmatter", 0) + let l:vim_markdown_frontmatter = get(g:, 'vim_markdown_frontmatter', 0) for i in range(1, line('$')) let l:lineraw = getline(i) let l:l1 = getline(i+1) - let l:line = substitute(l:lineraw, "#", "\\\#", "g") + let l:line = substitute(l:lineraw, '#', "\\\#", 'g') " exclude lines in fenced code blocks - if l:line =~ '````*' || l:line =~ '\~\~\~\~*' + if l:line =~# '````*' || l:line =~# '\~\~\~\~*' if l:fenced_block == 0 let l:fenced_block = 1 elseif l:fenced_block == 1 @@ -176,24 +176,24 @@ " exclude lines in frontmatters elseif l:vim_markdown_frontmatter == 1 if l:front_matter == 1 - if l:line == '---' + if l:line ==# '---' let l:front_matter = 0 endif elseif i == 1 - if l:line == '---' + if l:line ==# '---' let l:front_matter = 1 endif endif endif " match line against header regex - if join(getline(i, i + 1), "\n") =~ s:headersRegexp && l:line =~ '^\S' + if join(getline(i, i + 1), "\n") =~# s:headersRegexp && l:line =~# '^\S' let l:is_header = 1 else let l:is_header = 0 endif - if l:is_header == 1 && l:fenced_block == 0 && l:front_matter == 0 + if l:is_header ==# 1 && l:fenced_block ==# 0 && l:front_matter ==# 0 " remove hashes from atx headers - if match(l:line, "^#") > -1 + if match(l:line, '^#') > -1 let l:line = substitute(l:line, '\v^#*[ ]*', '', '') let l:line = substitute(l:line, '\v[ ]*#*$', '', '') endif @@ -361,11 +361,11 @@ let l:header_list = s:GetHeaderList() let l:indented_header_list = [] if len(l:header_list) == 0 - echom "Toc: No headers." + echom 'Toc: No headers.' return endif let l:header_max_len = 0 - let l:vim_markdown_toc_autofit = get(g:, "vim_markdown_toc_autofit", 0) + let l:vim_markdown_toc_autofit = get(g:, 'vim_markdown_toc_autofit', 0) for h in l:header_list " set header number of the cursor position if l:cursor_header == 0 @@ -438,7 +438,7 @@ let l:toc = [] let l:header_list = s:GetHeaderList() if len(l:header_list) == 0 - echom "InsertToc: No headers." + echom 'InsertToc: No headers.' return endif @@ -550,7 +550,7 @@ " Move colons for alignment to left or right side of the cell. execute 's/:\( \+\)|/\1:|/e' . l:flags execute 's/|\( \+\):/|:\1/e' . l:flags - execute 's/|\zs \+\ze|/\=repeat("-", len(submatch(0)))/' . l:flags + execute 's/|:\?\zs[ -]\+\ze:\?|/\=repeat("-", len(submatch(0)))/' . l:flags call setpos('.', l:pos) endfunction @@ -653,7 +653,7 @@ " function! s:OpenUrlUnderCursor() let l:url = s:Markdown_GetUrlForPosition(line('.'), col('.')) - if l:url != '' + if l:url !=# '' call s:VersionAwareNetrwBrowseX(l:url) else echomsg 'The cursor is not on a link.' @@ -667,11 +667,11 @@ let l:editmethod = '' " determine how to open the linked file (split, tab, etc) if exists('g:vim_markdown_edit_url_in') - if g:vim_markdown_edit_url_in == 'tab' + if g:vim_markdown_edit_url_in ==# 'tab' let l:editmethod = 'tabnew' - elseif g:vim_markdown_edit_url_in == 'vsplit' + elseif g:vim_markdown_edit_url_in ==# 'vsplit' let l:editmethod = 'vsp' - elseif g:vim_markdown_edit_url_in == 'hsplit' + elseif g:vim_markdown_edit_url_in ==# 'hsplit' let l:editmethod = 'sp' else let l:editmethod = 'edit' @@ -681,7 +681,7 @@ let l:editmethod = 'edit' endif let l:url = s:Markdown_GetUrlForPosition(line('.'), col('.')) - if l:url != '' + if l:url !=# '' if get(g:, 'vim_markdown_autowrite', 0) write endif @@ -691,14 +691,14 @@ if len(l:parts) == 2 let [l:url, l:anchor] = parts let l:anchorexpr = get(g:, 'vim_markdown_anchorexpr', '') - if l:anchorexpr != '' + if l:anchorexpr !=# '' let l:anchor = eval(substitute( \ l:anchorexpr, 'v:anchor', \ escape('"'.l:anchor.'"', '"'), '')) endif endif endif - if l:url != '' + if l:url !=# '' let l:ext = '' if get(g:, 'vim_markdown_no_extensions_in_markdown', 0) " use another file extension if preferred @@ -711,11 +711,11 @@ let l:url = fnameescape(fnamemodify(expand('%:h').'/'.l:url.l:ext, ':.')) execute l:editmethod l:url endif - if l:anchor != '' + if l:anchor !=# '' silent! execute '/'.l:anchor endif else - execute l:editmethod . " <cfile>" + execute l:editmethod . ' <cfile>' endif endfunction endif @@ -770,8 +770,8 @@ if exists('g:vim_markdown_fenced_languages') let s:filetype_dict = {} for s:filetype in g:vim_markdown_fenced_languages - let key = matchstr(s:filetype, "[^=]*") - let val = matchstr(s:filetype, "[^=]*$") + let key = matchstr(s:filetype, '[^=]*') + let val = matchstr(s:filetype, '[^=]*$') let s:filetype_dict[key] = val endfor else @@ -788,8 +788,8 @@ " Look for code blocks in the current file let filetypes = {} for line in getline(1, '$') - let ft = matchstr(line, '```\s*\zs[0-9A-Za-z_+-]*\ze.*') - if !empty(ft) && ft !~ '^\d*$' | let filetypes[ft] = 1 | endif + let ft = matchstr(line, '\(`\{3,}\|\~\{3,}\)\s*\zs[0-9A-Za-z_+-]*\ze.*') + if !empty(ft) && ft !~# '^\d*$' | let filetypes[ft] = 1 | endif endfor if !exists('b:mkd_known_filetypes') let b:mkd_known_filetypes = {} @@ -812,15 +812,17 @@ else let filetype = ft endif - let group = 'mkdSnippet' . toupper(substitute(filetype, "[+-]", "_", "g")) + let group = 'mkdSnippet' . toupper(substitute(filetype, '[+-]', '_', 'g')) if !has_key(b:mkd_included_filetypes, filetype) let include = s:SyntaxInclude(filetype) let b:mkd_included_filetypes[filetype] = 1 else let include = '@' . toupper(filetype) endif - let command = 'syntax region %s matchgroup=%s start="^\s*```\s*%s.*$" matchgroup=%s end="\s*```$" keepend contains=%s%s' - execute printf(command, group, startgroup, ft, endgroup, include, has('conceal') && get(g:, 'vim_markdown_conceal', 1) && get(g:, 'vim_markdown_conceal_code_blocks', 1) ? ' concealends' : '') + let command_backtick = 'syntax region %s matchgroup=%s start="^\s*`\{3,}\s*%s.*$" matchgroup=%s end="\s*`\{3,}$" keepend contains=%s%s' + let command_tilde = 'syntax region %s matchgroup=%s start="^\s*\~\{3,}\s*%s.*$" matchgroup=%s end="\s*\~\{3,}$" keepend contains=%s%s' + execute printf(command_backtick, group, startgroup, ft, endgroup, include, has('conceal') && get(g:, 'vim_markdown_conceal', 1) && get(g:, 'vim_markdown_conceal_code_blocks', 1) ? ' concealends' : '') + execute printf(command_tilde, group, startgroup, ft, endgroup, include, has('conceal') && get(g:, 'vim_markdown_conceal', 1) && get(g:, 'vim_markdown_conceal_code_blocks', 1) ? ' concealends' : '') execute printf('syntax cluster mkdNonListItem add=%s', group) let b:mkd_known_filetypes[ft] = 1 @@ -854,13 +856,17 @@ function! s:MarkdownRefreshSyntax(force) - if &filetype =~ 'markdown' && line('$') > 1 + " Use != to compare &syntax's value to use the same logic run on + " $VIMRUNTIME/syntax/synload.vim. + " + " vint: next-line -ProhibitEqualTildeOperator + if &filetype =~# 'markdown' && line('$') > 1 && &syntax != 'OFF' call s:MarkdownHighlightSources(a:force) endif endfunction function! s:MarkdownClearSyntaxVariables() - if &filetype =~ 'markdown' + if &filetype =~# 'markdown' unlet! b:mkd_included_filetypes endif endfunction diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/indent/markdown.vim new/vim-markdown-2.0.0+20220507/indent/markdown.vim --- old/vim-markdown-2.0.0+20220129/indent/markdown.vim 2022-01-29 12:20:11.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/indent/markdown.vim 2022-05-07 13:25:06.000000000 +0200 @@ -1,4 +1,4 @@ -if exists("b:did_indent") | finish | endif +if exists('b:did_indent') | finish | endif let b:did_indent = 1 setlocal indentexpr=GetMarkdownIndent() @@ -8,7 +8,7 @@ " Automatically continue blockquote on line break setlocal formatoptions+=r setlocal comments=b:> -if get(g:, "vim_markdown_auto_insert_bullets", 1) +if get(g:, 'vim_markdown_auto_insert_bullets', 1) " Do not automatically insert bullets when auto-wrapping with text-width setlocal formatoptions-=c " Accept various markers as bullets @@ -16,24 +16,24 @@ endif " Only define the function once -if exists("*GetMarkdownIndent") | finish | endif +if exists('*GetMarkdownIndent') | finish | endif function! s:IsMkdCode(lnum) let name = synIDattr(synID(a:lnum, 1, 0), 'name') - return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)') + return (name =~# '^mkd\%(Code$\|Snippet\)' || name !=# '' && name !~? '^\%(mkd\|html\)') endfunction function! s:IsLiStart(line) - return a:line !~ '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' && - \ a:line =~ '^\s*[*+-] \+' + return a:line !~# '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' && + \ a:line =~# '^\s*[*+-] \+' endfunction function! s:IsHeaderLine(line) - return a:line =~ '^\s*#' + return a:line =~# '^\s*#' endfunction function! s:IsBlankLine(line) - return a:line =~ '^$' + return a:line =~# '^$' endfunction function! s:PrevNonBlank(lnum) @@ -48,7 +48,7 @@ if v:lnum > 2 && s:IsBlankLine(getline(v:lnum - 1)) && s:IsBlankLine(getline(v:lnum - 2)) return 0 endif - let list_ind = get(g:, "vim_markdown_new_list_item_indent", 4) + let list_ind = get(g:, 'vim_markdown_new_list_item_indent', 4) " Find a non-blank line above the current line. let lnum = s:PrevNonBlank(v:lnum - 1) " At the start of the file use zero indent. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/syntax/markdown.vim new/vim-markdown-2.0.0+20220507/syntax/markdown.vim --- old/vim-markdown-2.0.0+20220129/syntax/markdown.vim 2022-01-29 12:20:11.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/syntax/markdown.vim 2022-05-07 13:25:06.000000000 +0200 @@ -7,7 +7,7 @@ " Read the HTML syntax to start with -if version < 600 +if v:version < 600 so <sfile>:p:h/html.vim else runtime! syntax/html.vim @@ -17,14 +17,14 @@ endif endif -if version < 600 +if v:version < 600 syntax clear -elseif exists("b:current_syntax") +elseif exists('b:current_syntax') finish endif " don't use standard HiLink, it will not work with included syntax files -if version < 508 +if v:version < 508 command! -nargs=+ HtmlHiLink hi link <args> else command! -nargs=+ HtmlHiLink hi def link <args> @@ -178,7 +178,7 @@ HtmlHiLink mkdLinkTitle htmlString HtmlHiLink mkdDelimiter Delimiter -let b:current_syntax = "mkd" +let b:current_syntax = 'mkd' delcommand HtmlHiLink " vim: ts=8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/test/folding-toc.vader new/vim-markdown-2.0.0+20220507/test/folding-toc.vader --- old/vim-markdown-2.0.0+20220129/test/folding-toc.vader 2022-01-29 12:20:11.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/test/folding-toc.vader 2022-05-07 13:25:06.000000000 +0200 @@ -2,6 +2,7 @@ Before: source ../after/ftplugin/markdown.vim + setlocal foldtext=foldtext() After: setlocal foldexpr=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/test/table-format.vader new/vim-markdown-2.0.0+20220507/test/table-format.vader --- old/vim-markdown-2.0.0+20220129/test/table-format.vader 2022-01-29 12:20:11.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/test/table-format.vader 2022-05-07 13:25:06.000000000 +0200 @@ -30,6 +30,19 @@ |---|---| | c | d | +Given markdown (indented table); + | a | b | + |---|---| + | c | d | + +Execute (format well formatted, indented table): + TableFormat + +Expect (table is not modified): + | a | b | + |---|---| + | c | d | + Given markdown; | left |right| center || | :- | --: |:---:|:| @@ -42,3 +55,16 @@ | left | right | center | | |:-----|------:|:------:|:--| | left | right | center | | + +Given markdown (indented table with colons); + | left |right| center || + | :- | --: |:---:|:| + | left |right| center || + +Execute (format indented table with colons): + TableFormat + +Expect (preserve colons to align text): + | left | right | center | | + |:-----|------:|:------:|:--| + | left | right | center | | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vim-markdown-2.0.0+20220129/test/vimrc new/vim-markdown-2.0.0+20220507/test/vimrc --- old/vim-markdown-2.0.0+20220129/test/vimrc 2022-01-29 12:20:11.000000000 +0100 +++ new/vim-markdown-2.0.0+20220507/test/vimrc 2022-05-07 13:25:06.000000000 +0200 @@ -1,16 +1,17 @@ set nocompatible -set rtp+=../ -set rtp+=../build/tabular/ -set rtp+=../build/vim-toml/ -set rtp+=../build/vim-json/ -set rtp+=../build/vader.vim/ -set rtp-=~/.vim -set rtp-=~/.vim/after + let $LANG='en_US' + +filetype off +set runtimepath+=../ +set runtimepath+=../build/tabular/ +set runtimepath+=../build/vim-toml/ +set runtimepath+=../build/vim-json/ +set runtimepath+=../build/vader.vim/ filetype on -filetype plugin on -filetype indent on -syntax on + +filetype plugin indent on +syntax enable function! Markdown_GetScriptID(fname) abort let l:snlist = '' @@ -24,6 +25,7 @@ endif endfor endfunction + function! Markdown_GetFunc(fname, funcname) abort return function('<SNR>' . Markdown_GetScriptID(a:fname) . '_' . a:funcname) endfunction ++++++ vim-markdown.obsinfo ++++++ --- /var/tmp/diff_new_pack.Y9Sedd/_old 2022-08-12 16:07:29.567623207 +0200 +++ /var/tmp/diff_new_pack.Y9Sedd/_new 2022-08-12 16:07:29.571623219 +0200 @@ -1,5 +1,5 @@ name: vim-markdown -version: 2.0.0+20220129 -mtime: 1643455211 -commit: 50d42082819cfa91745b6eff6e28ad5cbc8b27fa +version: 2.0.0+20220507 +mtime: 1651922706 +commit: 3a9643961233c2812816078af8bd1eaabc530dce ++++++ vimplugin-editorconfig-0.3.3.tar.gz -> vimplugin-editorconfig-1.1.1.tar.gz ++++++ ++++ 6878 lines of diff (skipped) ++++++ vimplugin-fugitive-3.4.tar.gz -> vimplugin-fugitive-3.7.tar.gz ++++++ ++++ 3086 lines of diff (skipped)
