Update to newest patchlevel of vim.

ChangeLog:

7.4.142  (after 7.4.137) on MS-Windows 8 IME input doen't work well
7.4.143  TextChangedI is not triggered.
7.4.144  MingW also supports intptr_t for OPEN_OH_ARGTYPE
7.4.145  getregtype() does not return zero for unknown register
7.4.146  when starting Vim with "-u NONE" v:oldfiles is NULL
7.4.147  cursor position wrong when using "gj" after "$"
7.4.148  cannot build with Cygwin and X1.
7.4.149  get E685 error when assigning a function to autoload variable
7.4.150  :keeppatterns is not respected for :s
7.4.151  Python: slices with steps are not supported
7.4.152  Python: Cannot iterate over options
7.4.153  compiler warning for pointer type
7.4.154  (after 7.4.149) still a problem with auto-loading
7.4.155  (after 7.4.150) search offset not kept with :keeppatterns
7.4.156  test file missing from distribution
7.4.157  error number used twice
7.4.158  pattern containing \zs not handled correctly by substitute()
7.4.159  completion hangs when using the current buffer after keywords
7.4.160  Win32: Crash when executing external command
7.4.161  crash in Python exception handling
7.4.162  running tests in shadow dir doesn't work
7.4.163  (after 7.4.142) MS-Windows 7 input doesn't work properly
7.4.164  problem with event handling on Windows 8
7.4.165  by default, after closing a buffer changes can't be undone
7.4.166  auto-loading a function for code that won't be executed
7.4.167  (after 7.4.149) fixes are not tested
7.4.168  can't compile with Ruby 2.1.0
7.4.169  ":sleep" puts cursor in the wrong column
7.4.170  some help tags don't work with ":help"
7.4.171  redo does not set v:count and v:count1
7.4.172  blowfish code says OFB, but it's doing CFB
7.4.173  when using scrollbind the cursor can end up below last line
7.4.174  compiler warnings for Python interface
7.4.175  wrong fall-back to non-wide function if wide function fails
7.4.176  Python: Dictionary.update() thows an unexpected error
7.4.177  compiler warning for unused variable
7.4.178  the J command does not update '[ and '] marks
7.4.179  Compiler warning for type-punned pointer
7.4.180  (after 7.4.174) older Python versions don't support %ld
7.4.181  when using 'pastetoggle' the status lines are not updated
7.4.182  building with mzscheme and racket does not work
7.4.183  MSVC Visual Studio update not supported
7.4.184  match() does not work properly with a {count} argument
7.4.185  Clang gives warnings
7.4.186  (after 7.4.085) Visual mode insert mode is sometimes wrong
7.4.187  delete that crosses line break splits multi-byte character
7.4.188  SIZEOF_LONG clashes with similar defines in header files
7.4.189  compiler warning for unused argument
7.4.190  compiler warning for using %lld for off_t
7.4.191  can't escape a file name for shell commands without a function
7.4.192  memory leak when giving E853
7.4.193  typos in messages
7.4.194  can't build for Android
7.4.195  (after 7.4.193) Python tests fail
7.4.196  tests fail on Solaris 9 and 10
7.4.197  various problems on VMS
7.4.198  can't build with non-threding Perl and dynamic loading
7.4.199  (issue 197) ]P doesn't paste over Visual selection
7.4.200  too many #ifdefs in the code
7.4.201  'lispwords' is a global option
7.4.202  MS-Windows: non-ASCII font names don't work
7.4.203  parsing 'errorformat' is not correct
7.4.204  a mapping where the second byte is 0x80 doesn't work
7.4.205  ":mksession" does not handle the argument list correctly
7.4.206  compiler warnings on 64 bit Windows
7.4.207  cursor report sometimes not recognized causing replace mode
7.4.208  Mercurial picks up files that are not distributed (empty)
7.4.209  when repeating a filter command "%" and "#" are expanded
7.4.210  Visual block mode + virtual edit doesn't work well with tabs
7.4.211  ":lu" is abbreviation for ":lua", but it should be ":lunmap"
7.4.212  #ifdefs for the +visual feature are not useful
7.4.213  it's not possible to open a new buffer without a swapfile
7.4.214  compilation problems on HP_nonStop (Tandem)
7.4.215  ":sp foo" reloads "foo" if it is the current buffer
7.4.216  compiler warnings
7.4.217  "make clean" may run configure pointlessly
7.4.218  it's not easy to remove duplicates from a list
7.4.219  redraw too often when 'relativenumber' or 'cursorline' set
7.4.220  test 105 does not work in a shadow dir
7.4.221  quickfix doesn't resize on ":copen 20"
7.4.222  the Ruby directory is constructed from parts
7.4.223  still using an older autoconf version
7.4.224  /usr/bin/grep on Solaris does not support -F
7.4.225  dynamic Ruby doesn't work on Solaris
7.4.226  (after 7.4.219) cursorline highlight not always redrawn
7.4.227  (after 7.4.225) can't build with Ruby 1.8
7.4.228  compiler warnings when building with Python 3.2
7.4.229  ":let" fails when listing vars with a curly braces expression
7.4.230  error when using ":options"
7.4.231  an error in ":options" is not caught by the tests
7.4.232  ":%s/\n//" uses a lot of memory
7.4.233  escaping special chars in ":!cmd %" is inconsistant
7.4.234  can't get the command that was used to start Vim
7.4.235  it is not easy to get the full path of a command
7.4.236  it's not that easy to check the Vim patch version
7.4.237  (after 7.4.236) has() not checking for specific patch
7.4.238  Vim does not support the smack library
7.4.239  ":e +" does not position cursor at end of the file
7.4.240  ":tjump" shows "\n" as "\\n"
7.4.241  submatch() does not distinguish between a NL and a NUL
7.4.242  getreg() does not distinguish between a NL and a NUL character
7.4.243  cannot use setreg() to add text that includes a NUL
7.4.244  (after 7.4.238) the smack feature causes stray error messages
7.4.245  crash for "vim -u NONE -N  -c '&&'"
7.4.246  configure message for detecting smack are out of sequence
7.4.247  NUL and NL mixed up when giving input to system()
7.4.248  cannot distinguish between NL and NUL in output of system()
7.4.249  using setreg() with a list of numbers does not work
7.4.250  some test files missing from distribution
7.4.251  crash when BufAdd autocommand wipes out the buffer
7.4.252  critical error in GTK, removing timer twice
7.4.253  crash when using external reference in syntax regexp
7.4.254  smack support detection is incomplete
7.4.255  configure check for smack doesn't work with all shells
7.4.256  (after 7.4.248) systemlist() does not work properly
7.4.257  compiler warning, possibly for mismatch in parameter name
7.4.258  configure fails if $CC contains options
7.4.259  warning for misplaced "const"
7.4.260  no error for function name with colon or lowercase char
7.4.261  an interactive :s to replace a "\n" with line break may fail
7.4.262  duplicate code in regexec()
7.4.263  GCC 4.8 compiler warning for hiding a declaration
7.4.264  (after 7.4.260) can't define function g:Foo()
7.4.265  (after 7.4.260) can't call function with "g:" in an expression
7.4.266  test 62 fails
7.4.267  (after 7.4.178) '[ mark is in the wrong position after "gq"
7.4.268  exists() on a funcref for script-local function does not work
7.4.269  CTRL-U in Insert mode does not work after using a cursor key
7.4.270  comparing pointers instead of the string they point to
7.4.271  compiler warning on 64 bit windows
7.4.272  using just "$" does not cause an error message
7.4.273  "make autoconf/reconfig" may run configure pointlessly
7.4.274  check for timestamp does not always detect a changed file
7.4.275  no error message when changing type of unplaced sign
7.4.276  the fish shell is not supported
7.4.277  using ":sign unplace *" may leave the cursor in wrong position
7.4.278  list_remove() conflicts with Sun header file
7.4.279  globpath() returns a string, a list would be better
7.4.280  relative position of cursor not restored if session has 2 tabs
7.4.281  positions are off when loading session with two tabpages
7.4.282  (after 7.4.279) test 97 fails on Mac
7.4.283  (after 7.4.276) compiler warning about unused variable
7.4.284  setting 'langmap' in the modeline can cause trouble
7.4.285  line numbers are not always updated for 'relativenumber'
7.4.286  error messages are inconsistant
7.4.287  patches for .hgignore don't work
7.4.288  when 'spellfile' is set the screen is not redrawn
7.4.289  NFA regexp with repeated backreference does not match
7.4.290  a non-greedy match followed by a branch is too greedy
7.4.291  compiler warning for int to pointer of different size
7.4.292  pattern "a" matches accented "a" when pattern is one byte
7.4.293  can't ignore composing characters in a pattern
7.4.294  (after 7.4.293) test files missing from patch
7.4.295  various typos, bad white space and unclear comments
7.4.296  can't run tests on Solaris
7.4.297  memory leak from result of get_isolated_shell_name()
7.4.298  can't have a funcref start with "t:"
7.4.299  when running configure twice DYNAMIC_PYTHON_DLL becomes empty
7.4.300  the way config.cache is removed doesn't always work
7.4.301  (after 7.4.280) scrolling problem when loading a session file
7.4.302  signs don't show up after filler lines
7.4.303  double-width chars on the command line sometimes truncated
7.4.304  cannot always use Python with Vim
7.4.305  making 'ttymouse' empty causes problems
7.4.306  getchar(0) does not return Esc
7.4.307  can't build without the +termresponse feature
7.4.308  ":diffsplit" on empty file cursor is displayed on command line
7.4.309  increasing size of lower window, upper window jumps to the top
7.4.310  getpos()/setpos() don't include curswant
7.4.311  can't use winrestview to only restore part of the view
7.4.312  cannot know what argument list is being used for a window
7.4.313  (after 7.4.310) changing return value of getpos() causes error
7.4.314  completion messages can get in the way of a plugin
7.4.315  (after 7.4.309) fixes for computation of topline not tested
7.4.316  warning from 64-bit compiler
7.4.317  crash when starting gvim, issue 230
7.4.318  fg/bg color settings ignored when checking syntax attributes
7.4.319  crash when putting zero bytes on the clipboard
7.4.320  possible crash when an BufLeave autocommand deletes the buffer
7.4.321  can't build with strawberry perl 5.20 + mingw-w64-4.9.0
7.4.322  using "msgfmt" is hard coded, cannot use "gmsgfmt"
7.4.323  substitute() with zero width pattern breaks multi-byte char
7.4.324  in Ex mode, cyrillic characters are not handled
7.4.325  incorrect display when starting GUI and setting 'laststatus'
7.4.326  can't build Tiny version
7.4.327  when 'verbose' is set may get E724 repeatedly
7.4.328  selection of inner block is inconsistent
7.4.329  window not scrolled if moving cursor and go to another window
7.4.330  using regexp pattern to show a position match can be slow
7.4.331  relative numbering not updated after a linewise yank
7.4.332  GTK: ugly gaps when a sign icon doesn't fit exactly
7.4.333  compiler warning for unused function
7.4.334  (after 7.4.330) unitialized variables, causing some problems
7.4.335  no digraph for the new rouble sign
7.4.336  setting 'history' to a big value causes out-of-memory errors
7.4.337  can't execute command line if there was an error before
7.4.338  cannot wrap lines taking indent into account
7.4.339  local function is available globally
7.4.340  error from sed about illegal bytes when installing Vim
7.4.341  sort() doesn't handle numbers well
7.4.342  clang gives warnings
7.4.343  matchdelete() does not always update the right lines
7.4.344  small issues related to matchaddpos()
7.4.345  (after 7.4.338) indent is not updated when deleting indent
7.4.346  (after 7.4.338) indent is not updated when changing 'briopt'
7.4.347  test55 fails on some systems
7.4.348  Using "J1" in 'cinoptions' may cause too much indent
7.4.349  avoid redrawing the whole window with highlighted matches
7.4.350  C-indenting for Javascript fails for a {} block inside parens
7.4.351  sort() is not stable
7.4.352  with 'linebreak' a Tab causes a missing line break
7.4.353  'linebreak' doesn't work with the 'list' option
7.4.354  compiler warning
7.4.355  several problems with Javascript indenting
7.4.356  mercurial does not ignore memfile_test
7.4.357  after completion some characters are not redrawn
7.4.358  (after 7.4.351) sort is not always stable
7.4.359  if 'ttymouse' set to 'uxterm' xterm version is not requested
7.4.360  pattern with "$" followed by \[vV] is not used as end-of-line
7.4.361  flickering when filling the preview window for 'omnifunc'
7.4.362  short length in matchaddpos() highlights until end of the line
7.4.363  in Windows console typing 0xCE does not work
7.4.364  no error message when the viminfo file can't be renamed
7.4.365  crash when using ":botright split" when there isn't much space
7.4.366  can't run the linebreak test on MS-Windows
7.4.367  (after 7.4.357) other solution for redrawing after completion
7.4.368  window sizes not restored properly when closing cmdline window
7.4.369  using freed memory when exiting while compiled with EXITFREE
7.4.370  linebreak test fails when encoding is not utf-8
7.4.371  with 'linebreak' set control characters displayed wrong
7.4.372  with 'winminheight' zero current window might be zero height
7.4.373  compiler warning for unused argument and unused variable
7.4.374  character after "fb" command sometimes not mapped
7.4.375  test 63 fails when run with GUI-only Vim
7.4.376  (after 7.4.367) popup menu flickers too much
7.4.377  with 'equalalways' set a split may report "no room"
7.4.378  title of quickfist list is not kept for setqflist(list, 'r')
7.4.379  accessing freed memory after using setqflist(list, 'r')
7.4.380  loading python may cause Vim to exit
7.4.381  u_undo error when backspacing in Insert mode deletes 2 lines
7.4.382  mapping chars may not work after typing Esc in Insert mode
7.4.383  bad interaction between preview window and omnifunc
7.4.384  test 102 fails when compiled with small features
7.4.385  when building with tiny/small features .mo files build fails
7.4.386  when splitting a window the changelist position is wrong
7.4.387  "4gro" replaces one character then executes "ooo"
7.4.388  with 'linebreak' set and 'list' unset Tab not counted properly
7.4.389  still sometimes Vim enters Replace mode when starting up
7.4.390  advancing pointer over end of a string
7.4.391  no 'cul' highlight with cursor on a line with diff highlight
7.4.392  not easy to detect type of command line window
7.4.393  text drawing on newer MS-Windows systems is suboptimal
7.4.394  (after 7.4.393) with DirectX last italic char is incomplete
7.4.395  C indent wrong below an if with wrapped () followed by {}
7.4.396  when 'clipboard' is "unnamed", :g/pat/d is very slow
7.4.397  matchparen only uses the topmost syntax item
7.4.398  (after 7.4.393) gcc error for argument of InterlockedIncrement
7.4.399  crypt implementation is messy; blowfish crypt has a weakness
7.4.400  list of distributed files is incomplete
7.4.401  (after 7.4.399) new files missing in Makefiles
7.4.402  test 72 crashes under certain conditions
7.4.403  valgrind reports errors when running test 72
7.4.404  Windows 64 bit compiler warnings
7.4.405  screen updating is slow when using matches
7.4.406  test 72 and 100 fail on MS-Windows
7.4.407  Visual block insert with cursor move repeats the wrong text
7.4.408  Visual block insert breaks a multi-byte character
7.4.409  can't build with Perl on Fedora 20
7.4.410  fold does not open after search with CmdwinLeave autocmd
7.4.411  "foo bar" sorts before "foo" with sort()
7.4.412  can't build on Windows XP with MSVC
7.4.413  MS-Windows: inserting dead key does not always work
7.4.414  cannot define a command only when it's used
7.4.415  (after 7.4.414) cannot build, warning for shadowed variable
7.4.416  problem with breakindent/showbreak and tabs
7.4.417  minimum width used for breakindent is not set after split
7.4.418  when leaving ":append" the cursor shape is like in Insert mode
7.4.419  when part of a list is locked it's possible to make changes
7.4.420  it's not obvious how to add a new test
7.4.421  crash when searching for "\ze*"
7.4.422  with conceal + linebreak some text is not displayed correctly
7.4.423  expand("$shell") does not work as documented
7.4.424  ml_get error when using Python to delete lines in a buffer
7.4.425  when 'showbreak' is used "gj" may move to the wrong position
7.4.426  README File missing from list of files
7.4.427  system() typeahead may be echoed and mess up the display
7.4.428  executable() may return a wrong result on MS-Windows
7.4.429  build fails with fewer features
7.4.430  test_listlbr fails when compiled with normal features

8 files changed, 44 insertions, 92 deletions

diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index 73e02162cf1..61c4b26da9d 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2014/05/29 23:36:32 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2014/09/08 21:55:33 morr Exp $
 
 PKGNAME=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=	2
 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 ce52de019fd..e90661cb734 100644
--- a/editors/vim-share/PLIST
+++ b/editors/vim-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2014/01/11 23:24:03 morr Exp $
+@comment $NetBSD: PLIST,v 1.23 2014/09/08 21:55:33 morr Exp $
 bin/xxd
 man/man1/evim.1
 man/man1/vim.1
@@ -20,6 +20,7 @@ share/vim/${VIM_SUBDIR}/autoload/javascriptcomplete.vim
 share/vim/${VIM_SUBDIR}/autoload/netrw.vim
 share/vim/${VIM_SUBDIR}/autoload/netrwFileHandlers.vim
 share/vim/${VIM_SUBDIR}/autoload/netrwSettings.vim
+share/vim/${VIM_SUBDIR}/autoload/netrw_gitignore.vim
 share/vim/${VIM_SUBDIR}/autoload/paste.vim
 share/vim/${VIM_SUBDIR}/autoload/phpcomplete.vim
 share/vim/${VIM_SUBDIR}/autoload/python3complete.vim
@@ -55,6 +56,7 @@ share/vim/${VIM_SUBDIR}/colors/delek.vim
 share/vim/${VIM_SUBDIR}/colors/desert.vim
 share/vim/${VIM_SUBDIR}/colors/elflord.vim
 share/vim/${VIM_SUBDIR}/colors/evening.vim
+share/vim/${VIM_SUBDIR}/colors/industry.vim
 share/vim/${VIM_SUBDIR}/colors/koehler.vim
 share/vim/${VIM_SUBDIR}/colors/morning.vim
 share/vim/${VIM_SUBDIR}/colors/murphy.vim
@@ -86,6 +88,7 @@ share/vim/${VIM_SUBDIR}/compiler/g95.vim
 share/vim/${VIM_SUBDIR}/compiler/gcc.vim
 share/vim/${VIM_SUBDIR}/compiler/gfortran.vim
 share/vim/${VIM_SUBDIR}/compiler/gnat.vim
+share/vim/${VIM_SUBDIR}/compiler/go.vim
 share/vim/${VIM_SUBDIR}/compiler/haml.vim
 share/vim/${VIM_SUBDIR}/compiler/hp_acc.vim
 share/vim/${VIM_SUBDIR}/compiler/icc.vim
@@ -302,6 +305,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/dictdconf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/diff.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dircolors.vim
 share/vim/${VIM_SUBDIR}/ftplugin/docbk.vim
+share/vim/${VIM_SUBDIR}/ftplugin/dockerfile.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dosbatch.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dosini.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dtd.vim
@@ -321,6 +325,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/gitcommit.vim
 share/vim/${VIM_SUBDIR}/ftplugin/gitconfig.vim
 share/vim/${VIM_SUBDIR}/ftplugin/gitrebase.vim
 share/vim/${VIM_SUBDIR}/ftplugin/gitsendemail.vim
+share/vim/${VIM_SUBDIR}/ftplugin/go.vim
 share/vim/${VIM_SUBDIR}/ftplugin/gpg.vim
 share/vim/${VIM_SUBDIR}/ftplugin/gprof.vim
 share/vim/${VIM_SUBDIR}/ftplugin/group.vim
@@ -340,6 +345,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/j.vim
 share/vim/${VIM_SUBDIR}/ftplugin/java.vim
 share/vim/${VIM_SUBDIR}/ftplugin/javascript.vim
 share/vim/${VIM_SUBDIR}/ftplugin/jproperties.vim
+share/vim/${VIM_SUBDIR}/ftplugin/json.vim
 share/vim/${VIM_SUBDIR}/ftplugin/jsp.vim
 share/vim/${VIM_SUBDIR}/ftplugin/kconfig.vim
 share/vim/${VIM_SUBDIR}/ftplugin/kwt.vim
@@ -395,11 +401,17 @@ share/vim/${VIM_SUBDIR}/ftplugin/pyrex.vim
 share/vim/${VIM_SUBDIR}/ftplugin/python.vim
 share/vim/${VIM_SUBDIR}/ftplugin/qf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/quake.vim
+share/vim/${VIM_SUBDIR}/ftplugin/r.vim
 share/vim/${VIM_SUBDIR}/ftplugin/racc.vim
 share/vim/${VIM_SUBDIR}/ftplugin/readline.vim
+share/vim/${VIM_SUBDIR}/ftplugin/registry.vim
 share/vim/${VIM_SUBDIR}/ftplugin/reva.vim
+share/vim/${VIM_SUBDIR}/ftplugin/rhelp.vim
+share/vim/${VIM_SUBDIR}/ftplugin/rmd.vim
 share/vim/${VIM_SUBDIR}/ftplugin/rnc.vim
+share/vim/${VIM_SUBDIR}/ftplugin/rnoweb.vim
 share/vim/${VIM_SUBDIR}/ftplugin/rpl.vim
+share/vim/${VIM_SUBDIR}/ftplugin/rrst.vim
 share/vim/${VIM_SUBDIR}/ftplugin/rst.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ruby.vim
 share/vim/${VIM_SUBDIR}/ftplugin/sass.vim
@@ -421,10 +433,12 @@ share/vim/${VIM_SUBDIR}/ftplugin/sshconfig.vim
 share/vim/${VIM_SUBDIR}/ftplugin/sudoers.vim
 share/vim/${VIM_SUBDIR}/ftplugin/svg.vim
 share/vim/${VIM_SUBDIR}/ftplugin/sysctl.vim
+share/vim/${VIM_SUBDIR}/ftplugin/systemverilog.vim
 share/vim/${VIM_SUBDIR}/ftplugin/tcl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/tcsh.vim
 share/vim/${VIM_SUBDIR}/ftplugin/terminfo.vim
 share/vim/${VIM_SUBDIR}/ftplugin/tex.vim
+share/vim/${VIM_SUBDIR}/ftplugin/text.vim
 share/vim/${VIM_SUBDIR}/ftplugin/treetop.vim
 share/vim/${VIM_SUBDIR}/ftplugin/tt2html.vim
 share/vim/${VIM_SUBDIR}/ftplugin/udevconf.vim
@@ -435,6 +449,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/vb.vim
 share/vim/${VIM_SUBDIR}/ftplugin/verilog.vim
 share/vim/${VIM_SUBDIR}/ftplugin/vhdl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/vim.vim
+share/vim/${VIM_SUBDIR}/ftplugin/vroom.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xdefaults.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xf86conf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xhtml.vim
@@ -488,6 +503,7 @@ share/vim/${VIM_SUBDIR}/indent/fortran.vim
 share/vim/${VIM_SUBDIR}/indent/framescript.vim
 share/vim/${VIM_SUBDIR}/indent/gitconfig.vim
 share/vim/${VIM_SUBDIR}/indent/gitolite.vim
+share/vim/${VIM_SUBDIR}/indent/go.vim
 share/vim/${VIM_SUBDIR}/indent/haml.vim
 share/vim/${VIM_SUBDIR}/indent/hamster.vim
 share/vim/${VIM_SUBDIR}/indent/html.vim
@@ -497,6 +513,7 @@ share/vim/${VIM_SUBDIR}/indent/ishd.vim
 share/vim/${VIM_SUBDIR}/indent/j.vim
 share/vim/${VIM_SUBDIR}/indent/java.vim
 share/vim/${VIM_SUBDIR}/indent/javascript.vim
+share/vim/${VIM_SUBDIR}/indent/json.vim
 share/vim/${VIM_SUBDIR}/indent/jsp.vim
 share/vim/${VIM_SUBDIR}/indent/ld.vim
 share/vim/${VIM_SUBDIR}/indent/lifelines.vim
@@ -523,7 +540,11 @@ share/vim/${VIM_SUBDIR}/indent/pyrex.vim
 share/vim/${VIM_SUBDIR}/indent/python.vim
 share/vim/${VIM_SUBDIR}/indent/r.vim
 share/vim/${VIM_SUBDIR}/indent/readline.vim
+share/vim/${VIM_SUBDIR}/indent/rhelp.vim
+share/vim/${VIM_SUBDIR}/indent/rmd.vim
+share/vim/${VIM_SUBDIR}/indent/rnoweb.vim
 share/vim/${VIM_SUBDIR}/indent/rpl.vim
+share/vim/${VIM_SUBDIR}/indent/rrst.vim
 share/vim/${VIM_SUBDIR}/indent/rst.vim
 share/vim/${VIM_SUBDIR}/indent/ruby.vim
 share/vim/${VIM_SUBDIR}/indent/sass.vim
@@ -534,6 +555,7 @@ share/vim/${VIM_SUBDIR}/indent/sh.vim
 share/vim/${VIM_SUBDIR}/indent/sml.vim
 share/vim/${VIM_SUBDIR}/indent/sql.vim
 share/vim/${VIM_SUBDIR}/indent/sqlanywhere.vim
+share/vim/${VIM_SUBDIR}/indent/systemverilog.vim
 share/vim/${VIM_SUBDIR}/indent/tcl.vim
 share/vim/${VIM_SUBDIR}/indent/tcsh.vim
 share/vim/${VIM_SUBDIR}/indent/tex.vim
@@ -544,6 +566,7 @@ share/vim/${VIM_SUBDIR}/indent/vb.vim
 share/vim/${VIM_SUBDIR}/indent/verilog.vim
 share/vim/${VIM_SUBDIR}/indent/vhdl.vim
 share/vim/${VIM_SUBDIR}/indent/vim.vim
+share/vim/${VIM_SUBDIR}/indent/vroom.vim
 share/vim/${VIM_SUBDIR}/indent/xf86conf.vim
 share/vim/${VIM_SUBDIR}/indent/xhtml.vim
 share/vim/${VIM_SUBDIR}/indent/xinetd.vim
@@ -770,6 +793,7 @@ share/vim/${VIM_SUBDIR}/syntax/dnsmasq.vim
 share/vim/${VIM_SUBDIR}/syntax/docbk.vim
 share/vim/${VIM_SUBDIR}/syntax/docbksgml.vim
 share/vim/${VIM_SUBDIR}/syntax/docbkxml.vim
+share/vim/${VIM_SUBDIR}/syntax/dockerfile.vim
 share/vim/${VIM_SUBDIR}/syntax/dosbatch.vim
 share/vim/${VIM_SUBDIR}/syntax/dosini.vim
 share/vim/${VIM_SUBDIR}/syntax/dot.vim
@@ -795,6 +819,8 @@ share/vim/${VIM_SUBDIR}/syntax/esmtprc.vim
 share/vim/${VIM_SUBDIR}/syntax/esqlc.vim
 share/vim/${VIM_SUBDIR}/syntax/esterel.vim
 share/vim/${VIM_SUBDIR}/syntax/eterm.vim
+share/vim/${VIM_SUBDIR}/syntax/euphoria3.vim
+share/vim/${VIM_SUBDIR}/syntax/euphoria4.vim
 share/vim/${VIM_SUBDIR}/syntax/eviews.vim
 share/vim/${VIM_SUBDIR}/syntax/exim.vim
 share/vim/${VIM_SUBDIR}/syntax/expect.vim
@@ -828,6 +854,8 @@ share/vim/${VIM_SUBDIR}/syntax/gitsendemail.vim
 share/vim/${VIM_SUBDIR}/syntax/gkrellmrc.vim
 share/vim/${VIM_SUBDIR}/syntax/gnash.vim
 share/vim/${VIM_SUBDIR}/syntax/gnuplot.vim
+share/vim/${VIM_SUBDIR}/syntax/go.vim
+share/vim/${VIM_SUBDIR}/syntax/godoc.vim
 share/vim/${VIM_SUBDIR}/syntax/gp.vim
 share/vim/${VIM_SUBDIR}/syntax/gpg.vim
 share/vim/${VIM_SUBDIR}/syntax/gprof.vim
@@ -884,8 +912,10 @@ share/vim/${VIM_SUBDIR}/syntax/jess.vim
 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/jsp.vim
 share/vim/${VIM_SUBDIR}/syntax/kconfig.vim
+share/vim/${VIM_SUBDIR}/syntax/kivy.vim
 share/vim/${VIM_SUBDIR}/syntax/kix.vim
 share/vim/${VIM_SUBDIR}/syntax/kscript.vim
 share/vim/${VIM_SUBDIR}/syntax/kwt.vim
@@ -1044,12 +1074,14 @@ share/vim/${VIM_SUBDIR}/syntax/reva.vim
 share/vim/${VIM_SUBDIR}/syntax/rexx.vim
 share/vim/${VIM_SUBDIR}/syntax/rhelp.vim
 share/vim/${VIM_SUBDIR}/syntax/rib.vim
+share/vim/${VIM_SUBDIR}/syntax/rmd.vim
 share/vim/${VIM_SUBDIR}/syntax/rnc.vim
 share/vim/${VIM_SUBDIR}/syntax/rng.vim
 share/vim/${VIM_SUBDIR}/syntax/rnoweb.vim
 share/vim/${VIM_SUBDIR}/syntax/robots.vim
 share/vim/${VIM_SUBDIR}/syntax/rpcgen.vim
 share/vim/${VIM_SUBDIR}/syntax/rpl.vim
+share/vim/${VIM_SUBDIR}/syntax/rrst.vim
 share/vim/${VIM_SUBDIR}/syntax/rst.vim
 share/vim/${VIM_SUBDIR}/syntax/rtf.vim
 share/vim/${VIM_SUBDIR}/syntax/ruby.vim
@@ -1127,6 +1159,7 @@ share/vim/${VIM_SUBDIR}/syntax/syncolor.vim
 share/vim/${VIM_SUBDIR}/syntax/synload.vim
 share/vim/${VIM_SUBDIR}/syntax/syntax.vim
 share/vim/${VIM_SUBDIR}/syntax/sysctl.vim
+share/vim/${VIM_SUBDIR}/syntax/systemverilog.vim
 share/vim/${VIM_SUBDIR}/syntax/tads.vim
 share/vim/${VIM_SUBDIR}/syntax/tags.vim
 share/vim/${VIM_SUBDIR}/syntax/tak.vim
@@ -1182,6 +1215,7 @@ share/vim/${VIM_SUBDIR}/syntax/virata.vim
 share/vim/${VIM_SUBDIR}/syntax/vmasm.vim
 share/vim/${VIM_SUBDIR}/syntax/voscm.vim
 share/vim/${VIM_SUBDIR}/syntax/vrml.vim
+share/vim/${VIM_SUBDIR}/syntax/vroom.vim
 share/vim/${VIM_SUBDIR}/syntax/vsejcl.vim
 share/vim/${VIM_SUBDIR}/syntax/wdiff.vim
 share/vim/${VIM_SUBDIR}/syntax/web.vim
@@ -1287,6 +1321,8 @@ share/vim/${VIM_SUBDIR}/tutor/tutor.ru.utf-8
 share/vim/${VIM_SUBDIR}/tutor/tutor.sk
 share/vim/${VIM_SUBDIR}/tutor/tutor.sk.cp1250
 share/vim/${VIM_SUBDIR}/tutor/tutor.sk.utf-8
+share/vim/${VIM_SUBDIR}/tutor/tutor.sr.cp1250
+share/vim/${VIM_SUBDIR}/tutor/tutor.sr.utf-8
 share/vim/${VIM_SUBDIR}/tutor/tutor.sv
 share/vim/${VIM_SUBDIR}/tutor/tutor.sv.utf-8
 share/vim/${VIM_SUBDIR}/tutor/tutor.tr.iso9
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index ac1e2b22460..5c2e04d157c 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.143 2014/05/03 07:30:19 richard Exp $
+$NetBSD: distinfo,v 1.144 2014/09/08 21:55:33 morr Exp $
 
-SHA1 (vim-7.4.141.tar.bz2) = 23f7844950671f08768f2bc6bc1b97908cd01dfc
-RMD160 (vim-7.4.141.tar.bz2) = 7c67da719b2093d08c702b1706fc4cb72097bf13
-Size (vim-7.4.141.tar.bz2) = 9404354 bytes
+SHA1 (vim-7.4.430.tar.bz2) = bce3928edc470ccdca2e79a14e448d8beb3ac4c2
+RMD160 (vim-7.4.430.tar.bz2) = c7c2c703be1560b93d5b342702646edf8ff467ae
+Size (vim-7.4.430.tar.bz2) = 9650967 bytes
 SHA1 (patch-Makefile) = 741f2b59d843094dbc1677aef9df93cf97c8d5a1
 SHA1 (patch-auto_configure) = e25c8821182231074033132d70dab077c273d5f8
 SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56
diff --git a/editors/vim-share/patches/patch-eval.c b/editors/vim-share/patches/patch-eval.c
deleted file mode 100644
index 43ca9317b58..00000000000
--- a/editors/vim-share/patches/patch-eval.c
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-eval.c,v 1.1 2014/05/03 07:30:19 richard Exp $
-
---- src/eval.c.orig	2014-01-11 21:59:11.000000000 +0000
-+++ src/eval.c
-@@ -5981,7 +5981,7 @@ listitem_remove(l, item)
-     list_T  *l;
-     listitem_T *item;
- {
--    list_remove(l, item, item);
-+    vimlist_remove(l, item, item);
-     listitem_free(item);
- }
- 
-@@ -6553,7 +6553,7 @@ list_copy(orig, deep, copyID)
-  * Does not free the listitem or the value!
-  */
-     void
--list_remove(l, item, item2)
-+vimlist_remove(l, item, item2)
-     list_T	*l;
-     listitem_T	*item;
-     listitem_T	*item2;
-@@ -15344,7 +15344,7 @@ f_remove(argvars, rettv)
- 	    if (argvars[2].v_type == VAR_UNKNOWN)
- 	    {
- 		/* Remove one item, return its value. */
--		list_remove(l, item, item);
-+		vimlist_remove(l, item, item);
- 		*rettv = item->li_tv;
- 		vim_free(item);
- 	    }
-@@ -15370,7 +15370,7 @@ f_remove(argvars, rettv)
- 			EMSG(_(e_invrange));
- 		    else
- 		    {
--			list_remove(l, item, item2);
-+			vimlist_remove(l, item, item2);
- 			if (rettv_list_alloc(rettv) == OK)
- 			{
- 			    l = rettv->vval.v_list;
diff --git a/editors/vim-share/patches/patch-if__lua.c b/editors/vim-share/patches/patch-if__lua.c
deleted file mode 100644
index ab02b8778e2..00000000000
--- a/editors/vim-share/patches/patch-if__lua.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-if__lua.c,v 1.1 2014/05/03 07:30:19 richard Exp $
-
---- src/if_lua.c.orig	2013-04-22 08:09:33.000000000 +0000
-+++ src/if_lua.c
-@@ -734,7 +734,7 @@ luaV_list_newindex (lua_State *L)
-     if (li == NULL) return 0;
-     if (lua_isnil(L, 3)) /* remove? */
-     {
--	list_remove(l, li, li);
-+	vimlist_remove(l, li, li);
- 	clear_tv(&li->li_tv);
- 	vim_free(li);
-     }
diff --git a/editors/vim-share/patches/patch-if__py__both.h b/editors/vim-share/patches/patch-if__py__both.h
deleted file mode 100644
index adac695f690..00000000000
--- a/editors/vim-share/patches/patch-if__py__both.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-if__py__both.h,v 1.1 2014/05/03 07:30:19 richard Exp $
-
---- src/if_py_both.h.orig	2014-01-11 21:59:11.000000000 +0000
-+++ src/if_py_both.h
-@@ -2392,7 +2392,7 @@ ListAssItem(ListObject *self, Py_ssize_t
-     if (obj == NULL)
-     {
- 	li = list_find(l, (long) index);
--	list_remove(l, li, li);
-+	vimlist_remove(l, li, li);
- 	clear_tv(&li->li_tv);
- 	vim_free(li);
- 	return 0;
diff --git a/editors/vim-share/patches/patch-proto_eval.pro b/editors/vim-share/patches/patch-proto_eval.pro
deleted file mode 100644
index 4dee702711e..00000000000
--- a/editors/vim-share/patches/patch-proto_eval.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-proto_eval.pro,v 1.1 2014/05/03 07:30:19 richard Exp $
-
-'list_remove', being defined as well on SunOS under <sys/list.h>, causes
-a 'conflicting types' error when building with perl, python and/or ruby.
-Affects the following files: eval.c, if_lua.c and if_py_both.c
-
---- src/proto/eval.pro.orig	2013-07-06 19:39:48.000000000 +0000
-+++ src/proto/eval.pro
-@@ -59,7 +59,7 @@ int list_append_tv __ARGS((list_T *l, ty
- int list_append_dict __ARGS((list_T *list, dict_T *dict));
- int list_append_string __ARGS((list_T *l, char_u *str, int len));
- int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item));
--void list_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
-+void vimlist_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
- int garbage_collect __ARGS((void));
- void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID));
- void set_ref_in_list __ARGS((list_T *l, int copyID));
diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk
index 201d56e5289..8573b0dc50a 100644
--- a/editors/vim-share/version.mk
+++ b/editors/vim-share/version.mk
@@ -1,5 +1,5 @@
-# $NetBSD: version.mk,v 1.92 2014/01/11 23:24:03 morr Exp $
+# $NetBSD: version.mk,v 1.93 2014/09/08 21:55:33 morr Exp $
 
 VIM_VERSION=		7.4
-VIM_PATCHLEVEL=		141
+VIM_PATCHLEVEL=		430
 VIM_SUBDIR=		vim74