Remove VMS remnants

22 files changed, 60 insertions, 162 deletions

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 77813423ba..a6a2da61bf 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -832,12 +832,11 @@ These are not available when Vim has been compiled without the |+modify_fname|
 feature.
 These modifiers can be given, in this order:
 	:p	Make file name a full path.  Must be the first modifier.  Also
-		changes "~/" (and "~user/" for Unix and VMS) to the path for
-		the home directory.  If the name is a directory a path
-		separator is added at the end.  For a file name that does not
-		exist and does not have an absolute path the result is
-		unpredictable.  On MS-Windows an 8.3 filename is expanded to
-		the long name.
+		changes "~/" (and "~user/" for Unix) to the path for the home
+		directory.  If the name is a directory a path separator is
+		added at the end.  For a file name that does not exist and
+		does not have an absolute path the result is unpredictable.
+		On MS-Windows an 8.3 filename is expanded to the long name.
 	:8	Converts the path to 8.3 short format (currently only on
 		MS-Windows).  Will act on as much of a path that is an
 		existing path.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index b85ea71ece..99aad26104 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6803,7 +6803,6 @@ virtualedit		Compiled with 'virtualedit' option.
 visual			Compiled with Visual mode.
 visualextra		Compiled with extra Visual mode commands.
 			|blockwise-operators|.
-vms			VMS version of Vim.
 vreplace		Compiled with |gR| and |gr| commands.
 wildignore		Compiled with 'wildignore' option.
 wildmenu		Compiled with 'wildmenu' option.
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 2894814025..34c4b79059 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -37,7 +37,6 @@ Detail: The ":filetype on" command will load one of these files:
 		Mac	    $VIMRUNTIME/filetype.vim
 		MS-DOS	    $VIMRUNTIME\filetype.vim
 		Unix	    $VIMRUNTIME/filetype.vim
-		VMS	    $VIMRUNTIME/filetype.vim
 	This file is a Vim script that defines autocommands for the
 	BufNewFile and BufRead events.  If the file type is not found by the
 	name, the file $VIMRUNTIME/scripts.vim is used to detect it from the
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c646caae4f..1a5df11cdb 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1026,7 +1026,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	security reasons.
 
 						*'backupext'* *'bex'* *E589*
-'backupext' 'bex'	string	(default "~", for VMS: "_")
+'backupext' 'bex'	string	(default "~")
 			global
 			{not in Vi}
 	String which is appended to a file name to make the name of the
@@ -3313,8 +3313,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'grepprg'* *'gp'*
 'grepprg' 'gp'		string	(default "grep -n ",
 					Unix: "grep -n $* /dev/null",
-					Win32: "findstr /n" or "grep -n",
-						      VMS: "SEARCH/NUMBERS ")
+					Win32: "findstr /n" or "grep -n")
 			global or local to buffer |global-local|
 			{not in Vi}
 	Program to use for the |:grep| command.  This option may contain '%'
@@ -4264,7 +4263,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 'isfname' 'isf'		string	(default for MS-DOS and Win32:
 			     "@,48-57,/,\,.,-,_,+,,,#,$,%,{,},[,],:,@-@,!,~,="
 			    for AMIGA: "@,48-57,/,.,-,_,+,,,$,:"
-			    for VMS: "@,48-57,/,.,-,_,+,,,#,$,%,<,>,[,],:,;,~"
 			    otherwise: "@,48-57,/,.,-,_,+,,,#,$,%,~,=")
 			global
 			{not in Vi}
@@ -4418,8 +4416,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The 'keymodel' option is set by the |:behave| command.
 
 					*'keywordprg'* *'kp'*
-'keywordprg' 'kp'	string	(default "man" or "man -s",  DOS: ":help",
-						VMS: "help")
+'keywordprg' 'kp'	string	(default "man" or "man -s",  DOS: ":help")
 			global or local to buffer |global-local|
 			{not in Vi}
 	Program to use for the |K| command.  Environment variables are
@@ -4713,12 +4710,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 	security reasons.
 
 						*'makeprg'* *'mp'*
-'makeprg' 'mp'		string	(default "make", VMS: "MMS")
+'makeprg' 'mp'		string	(default "make")
 			global or local to buffer |global-local|
 			{not in Vi}
 	Program to use for the ":make" command.  See |:make_makeprg|.
-	This option may contain '%' and '#' characters (see  |:_%| and |:_#|), 
-	which are expanded to the current and alternate file name.  Use |::S| 
+	This option may contain '%' and '#' characters (see  |:_%| and |:_#|),
+	which are expanded to the current and alternate file name.  Use |::S|
 	to escape file names in case they contain special characters.
 	Environment variables are expanded |:set_env|.  See |option-backslash|
 	about including spaces and backslashes.
@@ -5687,11 +5684,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 					Macintosh: "$VIM:vimfiles,
 						$VIMRUNTIME,
 						$VIM:vimfiles:after"
-					VMS: "sys$login:vimfiles,
-						$VIM/vimfiles,
-						$VIMRUNTIME,
-						$VIM/vimfiles/after,
-						sys$login:vimfiles/after")
 			global
 			{not in Vi}
 	This is a list of directories which will be searched for runtime
@@ -7061,7 +7053,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 					  on Mac: "mac-ansi"
 				       on MS-DOS: "pcterm"
 					 on Unix: "ansi"
-					  on VMS: "ansi"
 				       on Win 32: "win32")
 			global
 	Name of the terminal.  Used for choosing the terminal control
@@ -7391,7 +7382,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 'ttymouse' 'ttym'	string	(default depends on 'term')
 			global
 			{not in Vi}
-			{only in Unix and VMS, doesn't work in the GUI; not
+			{only in Unix, doesn't work in the GUI; not
 			available when compiled without |+mouse|}
 	Name of the terminal type for which mouse codes are to be recognized.
 	Currently these strings are valid:
@@ -7498,8 +7489,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When 'undofile' is turned off the undo file is NOT deleted.
 
 						*'undolevels'* *'ul'*
-'undolevels' 'ul'	number	(default 100, 1000 for Unix, VMS,
-						and Win32)
+'undolevels' 'ul'	number	(default 100, 1000 for Unix and Win32)
 			global or local to buffer |global-local|
 			{not in Vi}
 	Maximum number of changes that can be undone.  Since undo information
@@ -7597,8 +7587,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 'viewdir' 'vdir'	string	(default for Amiga, MS-DOS, and Win32:
 							 "$VIM/vimfiles/view",
 				 for Unix: "~/.vim/view",
-				 for Macintosh: "$VIM:vimfiles:view"
-				 for VMS: "sys$login:vimfiles/view")
+				 for Macintosh: "$VIM:vimfiles:view")
 			global
 			{not in Vi}
 			{not available when compiled without the |+mksession|
diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt
index 0ffc661c95..9d07819a1e 100644
--- a/runtime/doc/print.txt
+++ b/runtime/doc/print.txt
@@ -95,7 +95,6 @@ If the option is empty, then vim will use the system default printer for
 'printencoding' 'penc'	String	(default empty, except for:
 					Windows: cp1252,
 					Macintosh: mac-roman,
-					VMS: dec-mcs,
 					HPUX: hp-roman8)
 			global
 Sets the character encoding used when printing.  This option tells VIM which
@@ -120,9 +119,9 @@ other than latin1 will require VIM to be compiled with the |+iconv| feature.
 If no conversion is possible then printing will fail.  Any characters that
 cannot be converted will be replaced with upside down question marks.
 
-Three print character encoding files are provided to support default Mac, VMS,
-and HPUX character encodings and are used by default on these platforms. Code
-page 1252 print character encoding is used by default on the Windows platform.
+Two print character encoding files are provided to support default Mac and
+HPUX character encodings and are used by default on these platforms. Code page
+1252 print character encoding is used by default on the Windows platform.
 
 							*pexpr-option*
 'printexpr' 'pexpr'	String	(default: see below)
@@ -134,8 +133,8 @@ The arguments to the ":hardcopy" command are in |v:cmdarg|.
 The expression must take care of deleting the file after printing it.
 When there is an error, the expression must return a non-zero number.
 If there is no error, return zero or an empty string.
-The default for non MS-Windows or VMS systems is to simply use "lpr" to print
-the file: >
+The default for non MS-Windows systems is to simply use "lpr" to print the
+file: >
 
     system('lpr' . (&printdevice == '' ? '' : ' -P' . &printdevice)
 	. ' ' . v:fname_in) . delete(v:fname_in) + v:shell_error
@@ -147,12 +146,6 @@ currently specified printdevice: >
 		? ' LPT1:' : (' \"' . &printdevice . '\"')))
 		. delete(v:fname_in)
 
-On VMS machines the default is to send the file to either the default or
-currently specified printdevice: >
-
-    system('print' . (&printdevice == '' ? '' : ' /queue=' .
-		&printdevice) . ' ' . v:fname_in) . delete(v:fname_in)
-
 If you change this option, using a function is an easy way to avoid having to
 escape all the spaces.  Example: >
 
@@ -613,12 +606,6 @@ X11
 
     http://www.cs.wisc.edu/~ghost/gv/
 
-OpenVMS
-
-- Is apparently supported in the main code now (untested).  See:
-
-    http://wwwthep.physik.uni-mainz.de/~plass/gv/
-
 Windows
 
 - GSview.  Obtainable from:
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 91322def5b..da447e3b78 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -340,9 +340,6 @@ A spell file might not be available in the current 'encoding'.  See
 |spell-mkspell| about how to create a spell file.  Converting a spell file
 with "iconv" will NOT work!
 
-Note: on VMS ".{enc}.spl" is changed to "_{enc}.spl" to avoid trouble with
-filenames.
-
 						    *spell-sug-file* *E781*
 If there is a file with exactly the same name as the ".spl" file but ending in
 ".sug", that file will be used for giving better suggestions.  It isn't loaded
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index bceaea0d83..b532a9fb02 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -122,9 +122,6 @@ The option arguments may be given in any order.  Single-letter options can be
 combined after one dash.  There can be no option arguments after the "--"
 argument.
 
-On VMS all option arguments are assumed to be lowercase, unless preceded with
-a slash.  Thus "-R" means recovery and "-/R" readonly.
-
 --help							*-h* *--help*
 -h		Give usage (help) message and exit.  {not in Vi}
 		See |info-message| about capturing the text.
@@ -488,8 +485,8 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 		avoids a long startup time when running Vim in a terminal
 		emulator and the connection to the X server is slow.
 		See |--startuptime| to find out if affects you.
-		Only makes a difference on Unix or VMS, when compiled with the
-		|+X11| feature.  Otherwise it's ignored.
+		Only makes a difference on Unix when compiled with the |+X11|
+		feature.  Otherwise it's ignored.
 		To disable the connection only for specific terminals, see the
 		'clipboard' option.
 		When the X11 Session Management Protocol (XSMP) handler has
@@ -668,7 +665,7 @@ In Evim these options are changed from their default value:
 	:set nocompatible	Use Vim improvements
 	:set insertmode		Remain in Insert mode most of the time
 	:set hidden		Keep invisible buffers loaded
-	:set backup		Keep backup files (not for VMS)
+	:set backup		Keep backup files
 	:set backspace=2	Backspace over everything
 	:set autoindent		auto-indent new lines
 	:set history=50		keep 50 lines of Ex commands
@@ -767,9 +764,9 @@ accordingly.  Vim proceeds in this order:
      a. If vim was started as |evim| or |eview| or with the |-y| argument, the
 	script $VIMRUNTIME/evim.vim will be loaded.
 							*system-vimrc*
-     b. For Unix, MS-DOS, MS-Windows, VMS, Macintosh, and Amiga,
-	the system vimrc file is read for initializations.  The path of this
-	file is shown with the ":version" command.  Mostly it's "$VIM/vimrc".
+     b. For Unix, MS-DOS, MS-Windows, Macintosh, and Amiga, the system vimrc
+	file is read for initializations.  The path of this file is shown with
+	the ":version" command.  Mostly it's "$VIM/vimrc".
 	Note that this file is ALWAYS read in 'compatible' mode, since the
 	automatic resetting of 'compatible' is only done later.  Add a ":set
 	nocp" command if you like.
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 40f30ff077..7f5e8ff390 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -204,9 +204,6 @@ Patch to support expression argument to sort() instead of a function name.
 Yasuhiro Matsumoto, 2013 May 31.
 Or should we add a more general mechanism, like lambda functions?
 
-VMS: Select() doesn't work properly, typing ESC may hang Vim.  Use sys$qiow
-instead. (Samuel Ferencik, 2013 Sep 28)
-
 Patch for XDG base directory support. (Jean François Bignolles, 2014 Mar 4)
 Remark on the docs.  Should not be a compile time feature.  But then what?
 
@@ -1587,12 +1584,6 @@ The buffer has the full path in ffname, should pass this to the autocommand.
 "vim -C" often has 'nocompatible', because it's set in some startup script.
 Set 'compatible' after startup is done?  Patch by James Vega, 2008 Feb 7.
 
-VMS: while editing a file found in complex, Vim will save file into the first
-directory of the path and not to the original location of the file.
-(Zoltan Arpadffy)
-
-VMS: VFC files are in some cases truncated during reading (Zoltan Arpadffy)
-
 input() completion should not insert a backslash to escape a space in a file
 name?
 
@@ -2726,8 +2717,6 @@ Problems that will (probably) not be solved:
     libraries, get a patch from Sun.
 -   Solaris 2.6 with GTK and Perl: gvim crashes when started.  Problem with X
     input method called from GDK code.  Without Perl it doesn't crash.
--   VMS: Vimdiff doesn't work with the VMS diff, because the output looks
-    different.  This makes test 47 fail.  Install a Unix-compatible diff.
 -   Win32 GUI: mouse wheel always scrolls rightmost window.  The events arrive
     in Vim as if the rightmost scrollbar was used.
 -   GTK with Gnome: Produces an error message when starting up:
@@ -4814,7 +4803,6 @@ Digraphs:
 Writing files:
 -   In vim_rename(), should lock "from" file when deleting "to" file for
     systems other than Amiga.
-8   write mch_isdevice() for Amiga, Mac, VMS, etc.
 8   When appending to a file, Vim should also make a backup and a 'patchmode'
     file.
 8   'backupskip' doesn't write a backup file at all, a bit dangerous for some
diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt
index 0de1fac803..0629687797 100644
--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
@@ -126,14 +126,7 @@ available, use the two-letter language code.  For French: >
 	vimtutor fr
 
 On Unix, if you prefer using the GUI version of Vim, use "gvimtutor" or
-"vimtutor -g" instead of "vimtutor".
-
-For OpenVMS, if Vim has been properly installed, you can start vimtutor from a
-VMS prompt with: >
-
-	@VIM:vimtutor
-
-Optionally add the two-letter language code as above.
+"vimtutor -g", optionally with a two-letter language code.
 
 
 On other systems, you have to do a little work:
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index a409d7e3ce..c448dd56f1 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -96,14 +96,9 @@ when pressing <Enter> in Insert mode, and when using the "o" command to open a
 new line.
 >
 
-	if has("vms")
-	  set nobackup
-	else
-	  set backup
-	endif
+	set backup
 
-This tells Vim to keep a backup copy of a file when overwriting it.  But not
-on the VMS system, since it keeps old versions of files already.  The backup
+This tells Vim to keep a backup copy of a file when overwriting it. The backup
 file will have the same name as the original file with "~" added.  See |07.4|
 >
 
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index a3abd2cfd3..0513b473dd 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -136,7 +136,6 @@ Support for different systems.
 	- MS-DOS in real-mode (no additional drivers required).
 	- In protected mode on Windows 3.1 and MS-DOS (DPMI driver required).
 	- Windows 95 and Windows NT, with support for long file names.
-	- VMS
 	- Macintosh
 	Note that on some systems features need to be disabled to reduce
 	resource usage, esp. on MS-DOS.  For some outdated systems you need to
diff --git a/runtime/evim.vim b/runtime/evim.vim
index 650ce428d6..e35f1be085 100644
--- a/runtime/evim.vim
+++ b/runtime/evim.vim
@@ -28,11 +28,7 @@ cnoremap <silent> <C-F> <C-C>:promptfind<CR>
 
 set backspace=2		" allow backspacing over everything in insert mode
 set autoindent		" always set autoindenting on
-if has("vms")
-  set nobackup		" do not keep a backup file, use versions instead
-else
-  set backup		" keep a backup file
-endif
+set backup		" keep a backup file
 set history=50		" keep 50 lines of command line history
 set ruler		" show the cursor position all the time
 set incsearch		" do incremental searching
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index a6b918a0f2..f6d455fcbf 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -91,11 +91,7 @@ au BufNewFile,BufRead *.wrm			setf acedb
 
 " Ada (83, 9X, 95)
 au BufNewFile,BufRead *.adb,*.ads,*.ada		setf ada
-if has("vms")
-  au BufNewFile,BufRead *.gpr,*.ada_m,*.adc	setf ada
-else
-  au BufNewFile,BufRead *.gpr			setf ada
-endif
+au BufNewFile,BufRead *.gpr			setf ada
 
 " AHDL
 au BufNewFile,BufRead *.tdf			setf ahdl
diff --git a/runtime/ftplugin/ada.vim b/runtime/ftplugin/ada.vim
index 0809e7b206..1f2d690b95 100644
--- a/runtime/ftplugin/ada.vim
+++ b/runtime/ftplugin/ada.vim
@@ -119,11 +119,7 @@ endif
 " Section: Compiler {{{1
 "
 if ! exists("g:ada_default_compiler")
-   if has("vms")
-      let g:ada_default_compiler = 'decada'
-   else
-      let g:ada_default_compiler = 'gnat'
-   endif
+   let g:ada_default_compiler = 'gnat'
 endif
 
 if ! exists("current_compiler")			||
diff --git a/runtime/ftplugin/c.vim b/runtime/ftplugin/c.vim
index 19e8c51edb..487ce7a165 100644
--- a/runtime/ftplugin/c.vim
+++ b/runtime/ftplugin/c.vim
@@ -15,7 +15,7 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo-=C
 
-let b:undo_ftplugin = "setl fo< com< ofu< | if has('vms') | setl isk< | endif"
+let b:undo_ftplugin = "setl fo< com< ofu<"
 
 " Set 'formatoptions' to break comment lines but not other lines,
 " and insert the comment leader when hitting <CR> or using "o".
@@ -29,11 +29,6 @@ endif
 " Set 'comments' to format dashed lists in comments.
 setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
 
-" In VMS C keywords contain '$' characters.
-if has("vms")
-  setlocal iskeyword+=$
-endif
-
 " When the matchit plugin is loaded, this makes the % command skip parens and
 " braces in comments.
 let b:match_words = &matchpairs . ',^\s*#\s*if\(\|def\|ndef\)\>:^\s*#\s*elif\>:^\s*#\s*else\>:^\s*#\s*endif\>'
diff --git a/runtime/ftplugin/zimbu.vim b/runtime/ftplugin/zimbu.vim
index ff281202e0..558aea7df0 100644
--- a/runtime/ftplugin/zimbu.vim
+++ b/runtime/ftplugin/zimbu.vim
@@ -15,7 +15,7 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo-=C
 
-let b:undo_ftplugin = "setl fo< com< ofu< efm< tw< et< sts< sw< | if has('vms') | setl isk< | endif"
+let b:undo_ftplugin = "setl fo< com< ofu< efm< tw< et< sts< sw<"
 
 " Set 'formatoptions' to break comment lines but not other lines,
 " and insert the comment leader when hitting <CR> or using "o".
diff --git a/runtime/gvimrc_example.vim b/runtime/gvimrc_example.vim
index 26b3001220..ad0fa1b982 100644
--- a/runtime/gvimrc_example.vim
+++ b/runtime/gvimrc_example.vim
@@ -1,14 +1,13 @@
 " An example for a gvimrc file.
 " The commands in this are executed when the GUI is started.
 "
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2001 Sep 02
+" Maintainer:   Bram Moolenaar <Bram@vim.org>
+" Last change:  2001 Sep 02
 "
 " To use it, copy it to
-"     for Unix:  ~/.gvimrc
-"	      for Amiga:  s:.gvimrc
+"  for Unix:  ~/.gvimrc
+"  for Amiga:  s:.gvimrc
 "  for MS-DOS and Win32:  $VIM\_gvimrc
-"	    for OpenVMS:  sys$login:.gvimrc
 
 " Make external commands work through a pipe instead of a pseudo-tty
 "set noguipty
@@ -16,9 +15,9 @@
 " set the X11 font to use
 " set guifont=-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
 
-set ch=2		" Make command line two lines high
+set ch=2                " Make command line two lines high
 
-set mousehide		" Hide the mouse when typing text
+set mousehide           " Hide the mouse when typing text
 
 " Make shift-insert work like in Xterm
 map <S-Insert> <MiddleMouse>
diff --git a/runtime/menu.vim b/runtime/menu.vim
index 09d3443155..682e6afac8 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -345,7 +345,7 @@ endfun
 " get NL separated string with file names
 let s:n = globpath(&runtimepath, "colors/*.vim")
 
-" split at NL, Ignore case for VMS and windows, sort on name
+" split at NL, ignore case for Windows, sort on name
 let s:names = sort(map(split(s:n, "\n"), 'substitute(v:val, "\\c.*[/\\\\:\\]]\\([^/\\\\:]*\\)\\.vim", "\\1", "")'), 1)
 
 " define all the submenu entries
@@ -372,7 +372,7 @@ if has("keymap")
 	let s:name = strpart(s:n, 0, s:i)
 	let s:n = strpart(s:n, s:i + 1, 19999)
       endif
-      " Ignore case for VMS and windows
+      " Ignore case for Windows
       let s:name = substitute(s:name, '\c.*[/\\:\]]\([^/\\:_]*\)\(_[0-9a-zA-Z-]*\)\=\.vim', '\1', '')
       exe "an 20.460." . s:idx . ' &Edit.&Keymap.' . s:name . " :set keymap=" . s:name . "<CR>"
       unlet s:name
@@ -389,11 +389,7 @@ endif
 
 " Programming menu
 if !exists("g:ctags_command")
-  if has("vms")
-    let g:ctags_command = "mc vim:ctags *.*"
-  else
-    let g:ctags_command = "ctags -R ."
-  endif
+  let g:ctags_command = "ctags -R ."
 endif
 
 an 40.300 &Tools.&Jump\ to\ this\ tag<Tab>g^]	g<C-]>
@@ -538,12 +534,8 @@ an <silent> 40.540 &Tools.Conve&rt\ back<Tab>:%!xxd\ -r
 " set.
 func! s:XxdConv()
   let mod = &mod
-  if has("vms")
-    %!mc vim:xxd
-  else
-    call s:XxdFind()
-    exe '%!"' . g:xxdprogram . '"'
-  endif
+  call s:XxdFind()
+  exe '%!"' . g:xxdprogram . '"'
   if getline(1) =~ "^0000000:"		" only if it worked
     set ft=xxd
   endif
@@ -552,12 +544,8 @@ endfun
 
 func! s:XxdBack()
   let mod = &mod
-  if has("vms")
-    %!mc vim:xxd -r
-  else
-    call s:XxdFind()
-    exe '%!"' . g:xxdprogram . '" -r'
-  endif
+  call s:XxdFind()
+  exe '%!"' . g:xxdprogram . '" -r'
   set ft=
   doautocmd filetypedetect BufReadPost
   let &mod = mod
@@ -586,7 +574,7 @@ while strlen(s:n) > 0
     let s:name = strpart(s:n, 0, s:i)
     let s:n = strpart(s:n, s:i + 1, 19999)
   endif
-  " Ignore case for VMS and windows
+  " Ignore case for Windows
   let s:name = substitute(s:name, '\c.*[/\\:\]]\([^/\\:]*\)\.vim', '\1', '')
   exe "an 30.440." . s:idx . ' &Tools.Se&T\ Compiler.' . s:name . " :compiler " . s:name . "<CR>"
   unlet s:name
diff --git a/runtime/syntax/dcl.vim b/runtime/syntax/dcl.vim
index b051b08cf1..cf62cdf202 100644
--- a/runtime/syntax/dcl.vim
+++ b/runtime/syntax/dcl.vim
@@ -107,9 +107,6 @@ syn match   dclGotoLabel	"^\$\s*\I\i*:\s*$"	contains=dclStart
 " parameters
 syn match   dclParam	"'\I[a-zA-Z0-9_$]*'\="
 
-" () matching (the clusters are commented out until a vim/vms comes out for v5.2+)
-"syn cluster dclNextGroups	contains=dclCmdDirPath,dclCmdProc,dclCmdProc,dclDirPath,dclFilename,dclFilename,dclMdfySet,dclMdfySetString,delCmdProc,dclExe,dclTodo
-"syn region  dclFuncList	matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" contains=ALLBUT,@dclNextGroups
 syn region  dclFuncList	matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" contains=ALLBUT,dclCmdDirPath,dclCmdProc,dclCmdProc,dclDirPath,dclFilename,dclFilename,dclMdfySet,dclMdfySetString,delCmdProc,dclExe,dclTodo
 syn match   dclError	")"
 
diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim
index 3175711aa1..6b234459e2 100644
--- a/runtime/vimrc_example.vim
+++ b/runtime/vimrc_example.vim
@@ -1,13 +1,12 @@
 " An example for a vimrc file.
 "
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2014 Feb 05
+" Maintainer:   Bram Moolenaar <Bram@vim.org>
+" Last change:  2014 Feb 05
 "
 " To use it, copy it to
 "     for Unix:  ~/.vimrc
-"	      for Amiga:  s:.vimrc
-"  for MS-DOS and Win32:  $VIM\_vimrc
-"	    for OpenVMS:  sys$login:.vimrc
+"     for Amiga:  s:.vimrc
+"     for MS-DOS and Win32:  $VIM\_vimrc
 
 " When started as "evim", evim.vim will already have done these settings.
 if v:progname =~? "evim"
@@ -21,16 +20,12 @@ set nocompatible
 " allow backspacing over everything in insert mode
 set backspace=indent,eol,start
 
-if has("vms")
-  set nobackup		" do not keep a backup file, use versions instead
-else
-  set backup		" keep a backup file (restore to previous version)
-  set undofile		" keep an undo file (undo changes after closing)
-endif
-set history=50		" keep 50 lines of command line history
-set ruler		" show the cursor position all the time
-set showcmd		" display incomplete commands
-set incsearch		" do incremental searching
+set backup             " keep a backup file (restore to previous version)
+set undofile           " keep an undo file (undo changes after closing)
+set history=50         " keep 50 lines of command line history
+set ruler              " show the cursor position all the time
+set showcmd            " display incomplete commands
+set incsearch          " do incremental searching
 
 " For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries
 " let &guioptions = substitute(&guioptions, "t", "", "g")
@@ -84,7 +79,7 @@ if has("autocmd")
 
 else
 
-  set autoindent		" always set autoindenting on
+  set autoindent               " always set autoindenting on
 
 endif " has("autocmd")
 
@@ -93,5 +88,5 @@ endif " has("autocmd")
 " Only define it when not defined already.
 if !exists(":DiffOrig")
   command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis
-		  \ | wincmd p | diffthis
+                 \ | wincmd p | diffthis
 endif
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index 612f475933..c8f09f9231 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -1,6 +1,5 @@
 /*
  * VIM - Vi IMproved	by Bram Moolenaar
- *	      VMS merge by Zoltan Arpadffy
  *
  * Do ":help uganda"  in Vim to read copying and usage conditions.
  * Do ":help credits" in Vim to see a list of people who contributed.
diff --git a/src/nvim/testdir/test30.in b/src/nvim/testdir/test30.in
index 4a8778d2de..3f7b9eb472 100644
--- a/src/nvim/testdir/test30.in
+++ b/src/nvim/testdir/test30.in
@@ -24,12 +24,7 @@ STARTTEST
 :set nobin eol
 :bwipe XXUnix XXDos XXMac
 :" create mixed format files
-:if has("vms")
-: !copy XXUnix,XXDos XXUxDs.
-: !copy XXUnix,XXMac XXUxMac.
-: !copy XXDos,XXMac  XXDosMac.
-: !copy XXUnix,XXDos,XXMac XXUxDsMc.
-:elseif has("win32")
+:if has("win32")
 : !copy /b XXUnix+XXDos XXUxDs
 : !copy /b XXUnix+XXMac XXUxMac
 : !copy /b XXDos+XXMac XXDosMac