sync with the, uh, real 4.5 release.

3 files changed, 44 insertions, 44 deletions

diff --git a/usr.bin/vim/doc/vim_gui.txt b/usr.bin/vim/doc/vim_gui.txt
index d8c4cb40289..e2377c3d177 100644
--- a/usr.bin/vim/doc/vim_gui.txt
+++ b/usr.bin/vim/doc/vim_gui.txt
@@ -1,4 +1,4 @@
-*vim_gui.txt*   For Vim version 4.5.  Last modification: 1996 Oct 5
+*vim_gui.txt*   For Vim version 4.5.  Last modification: 1996 Oct 12
 
 
 		       Vim's Graphical User Interface
@@ -102,7 +102,7 @@ Vim*useEnhancedFSB:		true
 Vim.foreground:			Black
 Vim.background:			Wheat
 Vim.boldColor:			Blue
-Vim.italColor:			Cyan
+Vim.italicColor:		Magenta
 Vim.underlineColor:		Brown
 Vim.cursorColor:		DarkGreen
 Vim*menuBar*font:		7x13
diff --git a/usr.bin/vim/doc/vim_menu.txt b/usr.bin/vim/doc/vim_menu.txt
index e413c7af7cb..f3654f21bf7 100644
--- a/usr.bin/vim/doc/vim_menu.txt
+++ b/usr.bin/vim/doc/vim_menu.txt
@@ -1,4 +1,4 @@
-" *vim_menu.txt*   For Vim version 4.5.  Last modification: 1996 May 29
+" *vim_menu.txt*   For Vim version 4.5.  Last modification: 1996 Oct 12
 "
 " These menu commands should recreate the default Vim menus.
 " You can use this as a start for your own set of menus.
@@ -14,57 +14,57 @@
 " Help menu
 " Note that the help commands use <Esc> to leave Insert/Visual/Command-line
 " mode
-:nmenu Help.Overview\ \ <F1>	:help<CR>
-:vmenu Help.Overview\ \ <F1>	<Esc>:help<CR>
-:menu! Help.Overview\ \ <F1>	<Esc>:help<CR>
+:nnoremenu Help.Overview\ \ <F1>	:help<CR>
+:vnoremenu Help.Overview\ \ <F1>	<Esc>:help<CR>
+:noremenu! Help.Overview\ \ <F1>	<Esc>:help<CR>
 
-:nmenu Help.How\ to\.\.\.	:help how_to<CR>
-:vmenu Help.How\ to\.\.\.	<Esc>:help how_to<CR>
-:menu! Help.How\ to\.\.\.	<Esc>:help how_to<CR>
+:nnoremenu Help.How\ to\.\.\.	:help how_to<CR>
+:vnoremenu Help.How\ to\.\.\.	<Esc>:help how_to<CR>
+:noremenu! Help.How\ to\.\.\.	<Esc>:help how_to<CR>
 
-:nmenu Help.GUI			:help gui<CR>
-:vmenu Help.GUI			<Esc>:help gui<CR>
-:menu! Help.GUI			<Esc>:help gui<CR>
+:nnoremenu Help.GUI			:help gui<CR>
+:vnoremenu Help.GUI			<Esc>:help gui<CR>
+:noremenu! Help.GUI			<Esc>:help gui<CR>
 
-:nmenu Help.Version		:version<CR>
-:vmenu Help.Version		<Esc>:version<CR>
-:menu! Help.Version		<Esc>:version<CR>
+:nnoremenu Help.Version		:version<CR>
+:vnoremenu Help.Version		<Esc>:version<CR>
+:noremenu! Help.Version		<Esc>:version<CR>
 
-:nmenu Help.Credits		:help credits<CR>
-:vmenu Help.Credits		<Esc>:help credits<CR>
-:menu! Help.Credits		<Esc>:help credits<CR>
+:nnoremenu Help.Credits		:help credits<CR>
+:vnoremenu Help.Credits		<Esc>:help credits<CR>
+:noremenu! Help.Credits		<Esc>:help credits<CR>
 
-:nmenu Help.Copying		:help uganda<CR>
-:vmenu Help.Copying		<Esc>:help uganda<CR>
-:menu! Help.Copying		<Esc>:help uganda<CR>
+:nnoremenu Help.Copying		:help uganda<CR>
+:vnoremenu Help.Copying		<Esc>:help uganda<CR>
+:noremenu! Help.Copying		<Esc>:help uganda<CR>
 
 " File menu
-:nmenu File.Save\ \ \ \ \ \ \ :w	:w<CR>
-:imenu File.Save\ \ \ \ \ \ \ :w	<C-O>:w<CR>
+:nnoremenu File.Save\ \ \ \ \ \ \ :w	:w<CR>
+:inoremenu File.Save\ \ \ \ \ \ \ :w	<C-O>:w<CR>
 
-:nmenu File.Close\ \ \ \ \ \ :q		:q<CR>
-:vmenu File.Close\ \ \ \ \ \ :q		<Esc>:q<CR>
-:menu! File.Close\ \ \ \ \ \ :q		<Esc>:q<CR>
+:nnoremenu File.Close\ \ \ \ \ \ :q		:q<CR>
+:vnoremenu File.Close\ \ \ \ \ \ :q		<Esc>:q<CR>
+:noremenu! File.Close\ \ \ \ \ \ :q		<Esc>:q<CR>
 
-:nmenu File.Quit\ \ \ \ \ \ \ :qa	:qa<CR>
-:vmenu File.Quit\ \ \ \ \ \ \ :qa	<Esc>:qa<CR>
-:menu! File.Quit\ \ \ \ \ \ \ :qa	<Esc>:qa<CR>
+:nnoremenu File.Quit\ \ \ \ \ \ \ :qa	:qa<CR>
+:vnoremenu File.Quit\ \ \ \ \ \ \ :qa	<Esc>:qa<CR>
+:noremenu! File.Quit\ \ \ \ \ \ \ :qa	<Esc>:qa<CR>
 
-:nmenu File.Save-Quit\ \ :wqa		:wqa<CR>
-:vmenu File.Save-Quit\ \ :wqa		<Esc>:wqa<CR>
-:menu! File.Save-Quit\ \ :wqa		<Esc>:wqa<CR>
+:nnoremenu File.Save-Quit\ \ :wqa		:wqa<CR>
+:vnoremenu File.Save-Quit\ \ :wqa		<Esc>:wqa<CR>
+:noremenu! File.Save-Quit\ \ :wqa		<Esc>:wqa<CR>
 
 " Edit menu
-:nmenu Edit.Undo			u
-:nmenu Edit.Redo			<C-R>
+:nnoremenu Edit.Undo			u
+:nnoremenu Edit.Redo			<C-R>
 
-:vmenu Edit.Cut				x
-:vmenu Edit.Copy			y
+:vnoremenu Edit.Cut				x
+:vnoremenu Edit.Copy			y
 
-:nmenu Edit.Put\ Before			[p
-:imenu Edit.Put\ Before			<C-O>[p
-:nmenu Edit.Put\ After			]p
-:imenu Edit.Put\ After			<C-O>]p
+:nnoremenu Edit.Put\ Before			[p
+:inoremenu Edit.Put\ Before			<C-O>[p
+:nnoremenu Edit.Put\ After			]p
+:inoremenu Edit.Put\ After			<C-O>]p
 
-:nmenu Edit.Paste			i<C-R>*<Esc>
-:menu! Edit.Paste			<C-R>*
+:nnoremenu Edit.Paste			i<C-R>*<Esc>
+:noremenu! Edit.Paste			<C-R>*
diff --git a/usr.bin/vim/doc/vim_ref.txt b/usr.bin/vim/doc/vim_ref.txt
index 77ab282e3f6..27af2260c71 100644
--- a/usr.bin/vim/doc/vim_ref.txt
+++ b/usr.bin/vim/doc/vim_ref.txt
@@ -3160,8 +3160,8 @@ option.  This works almost like typing
 
 {makeprg} is the string given with the 'makeprg' option.  Any command can be
 used, not just "make".  Characters '%' and '#' are expanded as usual on a
-command line.  You can use "#<" to insert the current filename without
-extension, for example ":set makeprg=make\ #<.o".
+command line.  You can use "%<" to insert the current filename without
+extension, for example ":set makeprg=make\ %<.o".
 
 [arguments] is anything that is typed after ":make".
 {shellpipe} is the 'shellpipe' option.