Update to vim 8.2.3172.

Changes:
8.2.2801  free Pascal makefile not recognized
8.2.2802  Vim9: illegal memory access
8.2.2803  flicker when the popup menu has an info popup
8.2.2804  setting buffer local mapping with mapset() changes global
8.2.2805  Vim9: cannot use legacy syntax in Vim9 script
8.2.2806  Vim9: using "++nr" as a command might not work
8.2.2807  build fails with tiny features
8.2.2808  Vim9: increment and decrement not sufficiently tested
8.2.2809  Vim9: :def function compilation fails when using :legacy
8.2.2810  Vim9: crash when calling a function in a substitute expression
8.2.2811  Vim9: error for missing white space doesn't say where
8.2.2812  Vim9: still crash when using substitute expression
8.2.2813  cannot grep using fuzzy matching
8.2.2814  Vim9: unused variable
8.2.2815  status line flickers when redrawing popup menu info
8.2.2816  Vim9: comment below expression in lambda causes problems
8.2.2817  Vim9: script sourcing continues after an error
8.2.2818  no jump added  when opening terminal in current window
8.2.2819  finishing an abbreviation with multi-byte char may not work
8.2.2820  session file may divide by zero
8.2.2821  MS-Windows: unnessarily loading libraries when registering OLE
8.2.2822  MS-Windows: unnessarily loading libraries when unregistering
8.2.2823  MS-Windows: launching Vim from installer doesn't open README
8.2.2824  MS-Windows: build failure with MSVC
8.2.2825  code in checkreadonly() not fully tested
8.2.2826  compiler warnings for int to size_t conversion
8.2.2827  test file was not deleted
8.2.2828  Coverity complains about not checking rename() return value
8.2.2829  some comments are not correct or clear
8.2.2830  terminal colors are not updated when 'background' is set
8.2.2831  Vim9: expandcmd() not tested
8.2.2832  operator cancelled by moving mouse when using popup
8.2.2833  two key command cancelled by moving mouse when using popup
8.2.2834  Vim9: :cexpr does not work with local variables
8.2.2835  Vim9: leaking memory in :cexpr
8.2.2836  build failure without the +quickfix feature
8.2.2837  various code lines not covered by tests
8.2.2838  file extension .wrap not recognized
8.2.2839  default redirection missing "ash" and "dash"
8.2.2840  Vim9: member operation not fully tested
8.2.2841  MS-Windows: cursor wrong when 'lz' and 'stl' are set
8.2.2842  Vim9: skip argument to searchpair() is not compiled
8.2.2843  Vim9: skip argument to searchpairpos() is not compiled
8.2.2844  Vim9: memory leak when using searchpair()
8.2.2845  MS-Windows: warning for signed/unsigned comparison
8.2.2846  Vim9: "echo Func()" does not give an error for using void
8.2.2847  Perl not tested sufficiently
8.2.2848  crash when calling partial
8.2.2849  bufwrite not sufficiently tested
8.2.2850  recalling commands from history is not tested
8.2.2851  using <Cmd> mapping on command line triggers CmdlineChanged
8.2.2852  configure can add --as-needed a second time
8.2.2853  window is not updated after using <Cmd> mapping
8.2.2854  custom statusline cannot contain % items
8.2.2855  white space after "->" does not give E274
8.2.2856  get readonly error for device that can't be written to
8.2.2857  Vim9: exception in ISN_INSTR caught at wrong level
8.2.2858  test fails because of changed error message
8.2.2859  Tcl test fails because of changed error message
8.2.2860  adding a text property causes the whole window to be redawn
8.2.2861  Vim9: "legacy return" is not recognized as a return statement
8.2.2862  removing a text property causes the whole window to be redawn
8.2.2863  removing a text property does not redraw optimally
8.2.2864  Vim9: crash when using inline function
8.2.2865  skipping over function body fails
8.2.2866  Vim9: memory leak when using inline function
8.2.2867  build failure
8.2.2868  Vim9: when executing compiled expression trylevel is changed
8.2.2869  using unified diff is not tested
8.2.2870  CmdlineChange event triggered twice for CTRL-R
8.2.2871  unnessary VIM_ISDIGIT() calls, badly indented code
8.2.2872  Python tests fail without the channel feature
8.2.2873  not enough tests for writing buffers
8.2.2874  MS-Windows: screen redraws too often
8.2.2875  cancelling inputlist() after a digit does not return zero
8.2.2876  configure cannot detect Python 3.10
8.2.2877  insufficient tests for popup menu rightleft
8.2.2878  Vim9: for loop list unpack only allows for one "_"
8.2.2879  file extension .hsig not recognized
8.2.2880  unified diff fails if actually used
8.2.2881  various pieces of code not covered by tests
8.2.2882  Vim9: memory leak when lambda has an error
8.2.2883  MS-Windows manifest file name is misleading
8.2.2884  not enough cscope code is covered by tests
8.2.2885  searching for \%'> does not match linewise end of line
8.2.2886  various pieces of code not covered by tests
8.2.2887  crash when passing null string to fullcommand()
8.2.2888  Vim9: "k" command recognized in Vim9 script
8.2.2889  typo and verbose comment in Makefiles
8.2.2890  text property duplicated when data block splits
8.2.2891  cannot build with Perl 5.34
8.2.2892  error message contains random characters
8.2.2893  multi-byte text in popup title shows up wrong
8.2.2894  MS-Windows: using enc_locale() for strftime() might not work
8.2.2895  Vim9: random characters appear in some error messages
8.2.2896  spellfile functionality not fully tested
8.2.2897  Vim9: can use reserved words at the script level
8.2.2898  QuitPre and ExitPre not triggered when GUI window is closed
8.2.2899  Appveyor script does not detect nmake failure
8.2.2900  QuitPre is triggered before :wq writes the file
8.2.2901  some operators not fully tested
8.2.2902  spellfile functionality not fully tested
8.2.2903  cursor position wrong on wrapped line with 'signcolumn'
8.2.2904  "g$" causes scroll if half a double width char is visible
8.2.2905  no error when defaults.vim cannot be loaded
8.2.2906  ASAN reports errors for test_startup
8.2.2907  memory leak when running out of memory
8.2.2908  crash when using a terminal popup window from cmdline window
8.2.2909  build error with non-Unix system
8.2.2910  test for cmdline window and terminal fails on MS-Windows
8.2.2911  pattern "\%V" does not match all of block selection
8.2.2912  MS-Windows: most users expect using Unicode
8.2.2913  MS-Windows conpty supports using mouse events
8.2.2914  cannot paste a block without adding padding
8.2.2915  MS-Windows: when using "default" for encoding utf-8 is used
8.2.2916  operators are not fully tested
8.2.2917  spellfile functionality not fully tested
8.2.2918  builtin function can be shadowed by global variable
8.2.2919  using ":!command" does not work if it uses posix_spawn()
8.2.2920  still a way to shadow a builtin function
8.2.2921  E704 for script local variable is not backwards compatible
8.2.2922  computing array length is done in various ways
8.2.2923  EBCDIC build is broken
8.2.2924  superfluous extern declaration
8.2.2925  Vim9: line continuation comment uses legacy syntax
8.2.2926  Vim9: no good error for using :legacy in a :def function
8.2.2927  test commented out because it fails with ASAN
8.2.2928  the evalfunc.c file is too big
8.2.2929  accidentally enable tcl by default
8.2.2930  when a popup is visible a mouse move my restart Visual mode
8.2.2931  Vim9: line continuation comment uses legacy syntax
8.2.2932  select mode test fails
8.2.2933  when 'clipboard' is "unnamed" zp does not work correctly
8.2.2934  ASAN error when using text from the clipboard
8.2.2935  calculating register width is not always needed
8.2.2936  Vim9: converting number to bool uses wrong stack offset
8.2.2937  popup test fails if rightleft feature not enabled
8.2.2938  after using motion force from feedkeys() it sticks
8.2.2939  GTK: righthand scrollbar does not show with split window
8.2.2940  MS-Windows: cannot see the size when resizing
8.2.2941  Vim9: using `=expr` does not handle a list of strings
8.2.2942  Vim9: error when calling function with too few arguments
8.2.2943  Vim9: check for argument count ignores default values
8.2.2944  Vim9: no error when using job or channel as a string
8.2.2945  some buffer related code is not tested
8.2.2946  Vim9: substitute expression cannot be a List
8.2.2947  build failure without the channel feature
8.2.2948  substitute() accepts a number but not a float expression
8.2.2949  tests failing because no error for float to string conversion
8.2.2950  sound code not fully tested
8.2.2951  Vim9: cannot use heredoc for :python, :lua, etc.
8.2.2952  recover test fails on big endian systems
8.2.2953  Vim9: leaking memory when using heredoc script
8.2.2954  short file name extension for Scala not recognized
8.2.2955  Vim9: using filter in compiled command does not work
8.2.2956  Vim9: need to plan for future additions
8.2.2957  using getchar() in Vim9 script is problematic
8.2.2958  function list test fails
8.2.2959  sound_playfile() is not tested on MS-Windows
8.2.2960  swap file recovery not sufficiently tested
8.2.2961  keys typed during a :normal command are discarded
8.2.2962  MS-Windows command line arguments have wrong encoding
8.2.2963  GUI: mouse move may start Visual mode with a popup visible
8.2.2964  Vim9: hang when using space after ->
8.2.2965  Vim9: crash when calling function that failed to compile
8.2.2966  ml_get errors after recovering a file
8.2.2967  Vim9: crash when using two levels of partials
8.2.2968  Vim9: memory leak
8.2.2969  subtracting from number option fails when result is zero
8.2.2970  Python configure check uses deprecated command
8.2.2971  cannot yank a block without trailing spaces
8.2.2972  "%bd" tries to delete popup window buffers, which fails
8.2.2973  fix for recovery and diff mode not tested
8.2.2974  Greek spell checking uses wrong case folding
8.2.2975  Vim9: can only use an autoload function name as a string
8.2.2976  build failure without the +eval feature
8.2.2977  crash when using a null function reference
8.2.2978  warning for uninitialized variable
8.2.2979  not all options code is covered by tests
8.2.2980  popup window test is a bit flaky
8.2.2981  recovery test is not run on big-endian systems
8.2.2982  Vim9: future commands are not reserved yet
8.2.2983  Vim9: an inline function requires specifying the return type
8.2.2984  Vim9: test fails because of missing return statement
8.2.2985  Vim9: a compiled function cannot be debugged
8.2.2986  build failure without the profile feature
8.2.2987  build failure with normal features
8.2.2988  Vim9: debugger test fails
8.2.2989  Vim9: memory leak when debugging a :def function
8.2.2990  Jupyter Notebook files are not recognized
8.2.2991  Vim9: no completion for :vim9 and :legacy
8.2.2992  Vim9: completion for :disassemble is incomplete
8.2.2993  'fileencodings' default value should depend on 'encoding'
8.2.2994  various code is not fully tested
8.2.2995  linker errors with dynamic Python 3.10
8.2.2996  Vim9: when debugging cannot inspect local variables
8.2.2997  Vim9: disassemble test fails
8.2.2998  Vim9: disassemble test fails
8.2.2999  balloon sometimes does not hide with GTK 3
8.2.3000  Vim9: warning for uninitialized variable
8.2.3001  Vim9: memory leak when compilation fails
8.2.3002  Vim doesn't abort on a fatal Tcl error
8.2.3003  Vim9: closure compiled with wrong compile type
8.2.3004  Vim9: error for missing colon given while skipping
8.2.3005  Vim9: using a void value does not give a proper error message
8.2.3006  crash when echoing a value very early
8.2.3007  Vim9: test for void value fails
8.2.3008  startup test may hang
8.2.3009  startup test may hang
8.2.3010  not enough testing for viminfo code
8.2.3011  Vim9: cannot get argument values during debugging
8.2.3012  when 'rightleft' is set the line number is drawn reversed
8.2.3013  Vim: when debugging only first line of command is displayed
8.2.3014  Coverity warns for freeing static string
8.2.3015  Vim9: Assigning to @# requires a string
8.2.3016  confusing error when expression is followed by comma
8.2.3017  Vim9: debugger shows too many lines
8.2.3018  'quickfixtextfunc' formatting is lost when switching buffers
8.2.3019  location list only has the start position.
8.2.3020  unreachable code
8.2.3021  spaces allowed between option name and "!", "?", etc.
8.2.3022  available encryption methods are not strong enough
8.2.3023  Vim9: arguments for execute() not checked at compile time
8.2.3024  execute() function test fails
8.2.3025  not enough tests for quickfix end_col and end_lnum
8.2.3026  Vim9: cannot set breakpoint in compiled function
8.2.3027  Vim9: breakpoint in compiled function not always checked
8.2.3028  GUI mouse events not tested
8.2.3029  Vim9: crash when using operator and list unpack assignment
8.2.3030  Coverity reports a memory leak
8.2.3031  no error if a function name starts with an underscore
8.2.3032  build problems with MSVC, other crypt issues with libsodium
8.2.3033  no error when using alpha delimiter with :global
8.2.3034  installing packages on github CI sometimes fails
8.2.3035  Vim9: crash when calling :def function with partial
8.2.3036  Vim9: builtin function arguments not checked at compile time
8.2.3037  configure reports libcanberra when checking for libsodium
8.2.3038  Amiga built-in version string doesn't include build date
8.2.3039  Vim9: breakpoint at a comment line does not work
8.2.3040  GUI: dropping files not tested
8.2.3041  detecting if the process of a swap file is running fails
8.2.3042  swap file test fails
8.2.3043  Amiga: cannot get the shell size on MorphOS and AROS
8.2.3044  Amiga MorphOS and AROS: process ID is not valid
8.2.3045  minor typos
8.2.3046  Amiga MorphOS: Term mode is set using DOS packets
8.2.3047  increment and decrement don't allow for next command
8.2.3048  strange error for white space after ++ command
8.2.3049  JSON patch file not recognized
8.2.3050  cannot recognize elixir files
8.2.3051  Vim9: for loop with one list variable does not work
8.2.3052  Vim9: "legacy call" does not work
8.2.3053  Vim9: cannot assign to @@ in :def function
8.2.3054  Vim9: unpack assignment using "_" after semicolon fails
8.2.3055  strange error for assigning to "x.key" on non-dictionary
8.2.3056  Vim9: using default value in lambda gives confusing error
8.2.3057  Vim9: debugger test fails with normal features and +terminal
8.2.3058  Vim9: cannot use ternary operator in parenthesis
8.2.3059  Vim9: memory leak when using lambda
8.2.3060  Vim9: cannot use ternary operator in parenthesis
8.2.3061  testing the shell option is incomplete and spread out
8.2.3062  internal error when adding several text properties
8.2.3063  crash when switching 'cryptmethod' to xchaha20 with undo file
8.2.3064  Vim9: in script cannot set item in uninitialized list
8.2.3065  Vim9: error when sourcing script twice and reusing function
8.2.3066  Vim9: debugging lambda does not work
8.2.3067  building fails with Athena
8.2.3068  Unicode tables are slightly outdated
8.2.3069  error messages are spread out
8.2.3070  not enough testing for shell use
8.2.3071  shell options are not set properly for PowerShell
8.2.3072  "zy" does not work well when "virtualedit' is "block"
8.2.3073  when cursor is move for block append wrong text is inserted
8.2.3074  popup_atcursor() uses wrong position with concealing
8.2.3075  xxd always reports an old version string
8.2.3076  Vim9: using try in catch block causes a hang
8.2.3077  Vim9: an error in a catch block is not reported
8.2.3078  Vim9: profile test fails
8.2.3079  Powershell core not supported by default
8.2.3080  recover test fails on 32bit systems
8.2.3081  cannot catch errors in a channel command
8.2.3082  a channel command "echoerr" does not show anything
8.2.3083  crash when passing null string to charclass()
8.2.3084  Vim9: builtin function argument types are not checked
8.2.3085  JSONC files are not recognized
8.2.3086  Vim9: breakpoint on "for" does not work
8.2.3087  Gemtext files are not recognized
8.2.3088  with 'virtualedit' set to "block" Visual highlight is wrong
8.2.3089  garbage collection has useless code
8.2.3090  in rare cases the cursor may be somewhere in a folded line
8.2.3091  Vim9: default argument expr. cannot use previous argument
8.2.3092  Vim9: builtin function test fails without +channel feature
8.2.3093  tablabel_tooltip test fails with Athena
8.2.3094  Test_popup_atcursor_pos() fails without the conceal feature
8.2.3095  with 'virtualedit' set to "block" block selection is wrong
8.2.3096  temp files remain after running tests
8.2.3097  crash when using "quit" at recovery prompt
8.2.3098  popup window test is flaky on MS-Windows with GUI
8.2.3099  Vim9: missing catch/finally not reported at script level
8.2.3100  Vim9: no error when using type with unknown number of args
8.2.3101  missing function prototype for vim_round()
8.2.3102  test for crash fix does not fail without the fix
8.2.3103  swap test may fail on some systems
8.2.3104  Vim9: unspecified function type causes type error
8.2.3105  Vim9: type of partial is wrong when it has arguments
8.2.3106  Vim9: confusing line number reported for error
8.2.3107  Vim9: error for arguments while type didn't specify arguments
8.2.3108  test for remote_foreground() fails
8.2.3109  check for $DISPLAY never fails
8.2.3110  a pattern that matches the cursor position is complicated
8.2.3111  Vim9: confusing error with extra whitespace before colon
8.2.3112  in rare cases the cursor may be somewhere in a folded line
8.2.3113  no error when for loop variable shadows script variable
8.2.3114  Amiga-like systems: build error using stat()
8.2.3115  Coverity complains about free_wininfo() use
8.2.3116  Vim9: crash when debugging a function with line continuation
8.2.3117  Vim9: type not properly checked in for loop
8.2.3118  Vim9: "any" type not handled correctly in for loop
8.2.3119  compiler warning for unused argument
8.2.3120  crypt with sodium test fails on MS-Windows
8.2.3121  'listchars' "exceeds" character appears in foldcolumn
8.2.3122  with 'nowrap' cursor position is unexected in narrow window
8.2.3123  Vim9: confusing error when using white space after option
8.2.3124  Vim9: no error for white space between option and "=9"
8.2.3125  variables are set but not used
8.2.3126  Vim9: for loop error reports wrong line number
8.2.3127  Vim9: no error when adding number to list of string
8.2.3128  Vim9: uninitialzed list does not get type checked
8.2.3129  Vim9: imported uninitialized list does not get type checked
8.2.3130  Vim9: import test fails
8.2.3131  MS-Windows: ipv6 channel test is very flaky in the GUI
8.2.3132  compiler warns for size_t to colnr_T conversion.
8.2.3133  Vim9: memory leak when add() fails
8.2.3134  crash when using typename() on a function reference
8.2.3135  Vim9: builtin function arguments not checked at compile time
8.2.3136  no test for E187 and "No swap file"
8.2.3137  Vim9: no error when a line only has a variable name
8.2.3138  debugger test fails
8.2.3139  functions for string manipulation are spread out
8.2.3140  MS-Windows: ipv6 channel test is very flaky also without GUI
8.2.3141  no error when using :complete for :command without -nargs
8.2.3142  Vim9: type check for has_key() argument is too strict
8.2.3143  Vim9: wrong context if lambda called from profiled function
8.2.3144  Vim9: no error when using an invalid value for a line number
8.2.3145  Vim9: profile test fails without profile feature
8.2.3146  Vim9: line number wrong for :execute argument
8.2.3147  Vim9: profiling does not work with a nested function
8.2.3148  Vim9: function arg type check does not handle base offset
8.2.3149  some plugins have a problem with the error check
8.2.3150  Vim9: argument types are not checked at compile time
8.2.3151  Vim9: profiling fails if nested function is also profiled
8.2.3152  Vim9: accessing "s:" results in an error
8.2.3153  URLs with a dash in the scheme are not recognized
8.2.3154  Vim9: some type checks for builtin functions fail
8.2.3155  some option related code not covered by tests
8.2.3156  Vim9: term_getansicolors() test fails without +termguicolors
8.2.3157  crypt test may fail on MS-Windows
8.2.3158  strange error message when using islocked() with a number
8.2.3159  cursor displayed in wrong position after deleting line
8.2.3160  'breakindent' does not work well for bulleted lists
8.2.3161  Vim9: no error when reltime() has invalid arguments
8.2.3162  Vim9: argument types are not checked at compile time
8.2.3163  location list window may open a wrong file
8.2.3164  MS-Windows: reported version lacks patchlevel
8.2.3165  Vim9: in a || expression the error line number may be wrong
8.2.3166  Vim9: nested autoload call error overruled by "Unknown error"
8.2.3167  get E12 in a job callback when searching for tags
8.2.3168  Vim9: type error for constant of type any
8.2.3169  Vim9: cannot handle nested inline function
8.2.3170  Illegal memory access in test
8.2.3171  another illegal memory access in test
8.2.3172  MzScheme test fails

4 files changed, 15 insertions, 10 deletions

diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index 2b995171f27..8b1e09c2bf2 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2021/05/24 19:52:08 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2021/07/17 17:49:21 morr Exp $
 
 PKGNAME=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1
 COMMENT=		Data files for the vim editor (vi clone)
 
 .include		"Makefile.common"
diff --git a/editors/vim-share/PLIST b/editors/vim-share/PLIST
index 07cd8016769..c825888e948 100644
--- a/editors/vim-share/PLIST
+++ b/editors/vim-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.56 2021/04/23 06:31:35 morr Exp $
+@comment $NetBSD: PLIST,v 1.57 2021/07/17 17:49:21 morr Exp $
 bin/xxd
 man/man1/evim.1
 man/man1/vim.1
@@ -387,6 +387,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/falcon.vim
 share/vim/${VIM_SUBDIR}/ftplugin/fetchmail.vim
 share/vim/${VIM_SUBDIR}/ftplugin/flexwiki.vim
 share/vim/${VIM_SUBDIR}/ftplugin/fortran.vim
+share/vim/${VIM_SUBDIR}/ftplugin/fpcmake.vim
 share/vim/${VIM_SUBDIR}/ftplugin/framescript.vim
 share/vim/${VIM_SUBDIR}/ftplugin/freebasic.vim
 share/vim/${VIM_SUBDIR}/ftplugin/fstab.vim
@@ -422,6 +423,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/javascript.vim
 share/vim/${VIM_SUBDIR}/ftplugin/javascriptreact.vim
 share/vim/${VIM_SUBDIR}/ftplugin/jproperties.vim
 share/vim/${VIM_SUBDIR}/ftplugin/json.vim
+share/vim/${VIM_SUBDIR}/ftplugin/jsonc.vim
 share/vim/${VIM_SUBDIR}/ftplugin/jsp.vim
 share/vim/${VIM_SUBDIR}/ftplugin/kconfig.vim
 share/vim/${VIM_SUBDIR}/ftplugin/kwt.vim
@@ -624,6 +626,7 @@ share/vim/${VIM_SUBDIR}/indent/java.vim
 share/vim/${VIM_SUBDIR}/indent/javascript.vim
 share/vim/${VIM_SUBDIR}/indent/javascriptreact.vim
 share/vim/${VIM_SUBDIR}/indent/json.vim
+share/vim/${VIM_SUBDIR}/indent/jsonc.vim
 share/vim/${VIM_SUBDIR}/indent/jsp.vim
 share/vim/${VIM_SUBDIR}/indent/ld.vim
 share/vim/${VIM_SUBDIR}/indent/less.vim
@@ -989,6 +992,7 @@ share/vim/${VIM_SUBDIR}/syntax/form.vim
 share/vim/${VIM_SUBDIR}/syntax/forth.vim
 share/vim/${VIM_SUBDIR}/syntax/fortran.vim
 share/vim/${VIM_SUBDIR}/syntax/foxpro.vim
+share/vim/${VIM_SUBDIR}/syntax/fpcmake.vim
 share/vim/${VIM_SUBDIR}/syntax/framescript.vim
 share/vim/${VIM_SUBDIR}/syntax/freebasic.vim
 share/vim/${VIM_SUBDIR}/syntax/fstab.vim
@@ -1020,6 +1024,7 @@ share/vim/${VIM_SUBDIR}/syntax/group.vim
 share/vim/${VIM_SUBDIR}/syntax/grub.vim
 share/vim/${VIM_SUBDIR}/syntax/gsp.vim
 share/vim/${VIM_SUBDIR}/syntax/gtkrc.vim
+share/vim/${VIM_SUBDIR}/syntax/gvpr.vim
 share/vim/${VIM_SUBDIR}/syntax/haml.vim
 share/vim/${VIM_SUBDIR}/syntax/hamster.vim
 share/vim/${VIM_SUBDIR}/syntax/haskell.vim
@@ -1069,6 +1074,7 @@ share/vim/${VIM_SUBDIR}/syntax/jgraph.vim
 share/vim/${VIM_SUBDIR}/syntax/jovial.vim
 share/vim/${VIM_SUBDIR}/syntax/jproperties.vim
 share/vim/${VIM_SUBDIR}/syntax/json.vim
+share/vim/${VIM_SUBDIR}/syntax/jsonc.vim
 share/vim/${VIM_SUBDIR}/syntax/jsp.vim
 share/vim/${VIM_SUBDIR}/syntax/kconfig.vim
 share/vim/${VIM_SUBDIR}/syntax/kivy.vim
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index e5f4bb0f23c..b508e44e8dc 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.191 2021/04/23 06:31:35 morr Exp $
+$NetBSD: distinfo,v 1.192 2021/07/17 17:49:21 morr Exp $
 
-SHA1 (vim-8.2.2800.tar.gz) = 422b3a45745f635bb0f21e5378fe366effa786f3
-RMD160 (vim-8.2.2800.tar.gz) = 413734bc82588a7ed22f932fb723bb30e4ee29e0
-SHA512 (vim-8.2.2800.tar.gz) = 39deb4fb6ab4a03fbbf72e88b199e5c7f72131edbe2b66d36da6dd9b32ecb42505aa7b056d9f751c2a6381f94a70a7853241717b87250f683090b21cd61663b8
-Size (vim-8.2.2800.tar.gz) = 15496713 bytes
+SHA1 (vim-8.2.3172.tar.gz) = f3a3cd48ccda738c9a573fc47e9ad17a7aaab9c3
+RMD160 (vim-8.2.3172.tar.gz) = 37f79c6cfbed6632c40692c749bb0fc510e60dd2
+SHA512 (vim-8.2.3172.tar.gz) = 3ebcd2a65e8f4a05f074d1612d4a50c90e90cd393eccd3a647dbb83d2c87a9e15b7d98dd387961c4dc7f0a2cde941b7ee63ef5f87ecb2d4086bf4a0dd1eed701
+Size (vim-8.2.3172.tar.gz) = 15628376 bytes
 SHA1 (patch-Makefile) = 342af6768ec3f5d86448a370538a3ad75e2259ee
 SHA1 (patch-auto_configure) = 6517ff23cb337f2fb3874f818d5a50861942aca9
 SHA1 (patch-configure) = 4514af45a71309dabfecb8aae019fdc2e36e45b6
diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk
index 4646d19a160..ec072c4b182 100644
--- a/editors/vim-share/version.mk
+++ b/editors/vim-share/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.133 2021/04/23 06:31:35 morr Exp $
+# $NetBSD: version.mk,v 1.134 2021/07/17 17:49:21 morr Exp $
 
 VIM_VERSION=		8.2
-VIM_PATCHLEVEL=		2800
+VIM_PATCHLEVEL=		3172
 # Changelog: see http://ftp.vim.org/pub/vim/patches/8.2/
 VIM_SUBDIR=		vim82