sync with the, uh, real 4.5 release.

9 files changed, 69 insertions, 59 deletions

diff --git a/usr.bin/vim/cmdline.c b/usr.bin/vim/cmdline.c
index 9c0ce156ad0..dd5c11fa02c 100644
--- a/usr.bin/vim/cmdline.c
+++ b/usr.bin/vim/cmdline.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmdline.c,v 1.5 1996/10/14 03:55:08 downsj Exp $	*/
+/*	$OpenBSD: cmdline.c,v 1.6 1996/10/15 08:07:49 downsj Exp $	*/
 /* vi:set ts=4 sw=4:
  *
  * VIM - Vi IMproved		by Bram Moolenaar
@@ -2529,9 +2529,11 @@ donextfile:		if (i < 0 || i >= arg_count)
 					msg(p);
 				break;
 
+#if 0
 		case CMD_mfstat:		/* print memfile statistics, for debugging */
 				mf_statistics();
 				break;
+#endif
 
 		case CMD_read:
 				if (usefilter)					/* :r!cmd */
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.
diff --git a/usr.bin/vim/edit.c b/usr.bin/vim/edit.c
index 3af8e14d70e..39d317733df 100644
--- a/usr.bin/vim/edit.c
+++ b/usr.bin/vim/edit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: edit.c,v 1.4 1996/10/14 03:55:10 downsj Exp $	*/
+/*	$OpenBSD: edit.c,v 1.5 1996/10/15 08:07:54 downsj Exp $	*/
 /* vi:set ts=4 sw=4:
  *
  * VIM - Vi IMproved		by Bram Moolenaar
@@ -359,6 +359,7 @@ edit(initstr, startln, count)
 					break;
 				default:
 					ctrl_x_mode = 0;
+					edit_submode = NULL;
 					break;
 			}
 			showmode();
diff --git a/usr.bin/vim/memfile.c b/usr.bin/vim/memfile.c
index 65bf552c660..7d4de845b02 100644
--- a/usr.bin/vim/memfile.c
+++ b/usr.bin/vim/memfile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memfile.c,v 1.3 1996/10/14 03:55:15 downsj Exp $	*/
+/*	$OpenBSD: memfile.c,v 1.4 1996/10/15 08:07:56 downsj Exp $	*/
 /* vi:set ts=4 sw=4:
  *
  * VIM - Vi IMproved		by Bram Moolenaar
@@ -1103,7 +1103,7 @@ mf_need_trans(mfp)
 	return (mfp->mf_fname != NULL && mfp->mf_neg_count > 0);
 }
 
-#if 1			/* included for beta release, TODO: remove later */
+#if 0			/* included for beta testing only */
 /*
  * print statistics for a memfile (for debugging)
  */
diff --git a/usr.bin/vim/unix.c b/usr.bin/vim/unix.c
index 9d4a85ff761..b3cf805f6ec 100644
--- a/usr.bin/vim/unix.c
+++ b/usr.bin/vim/unix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unix.c,v 1.3 1996/10/14 03:55:32 downsj Exp $	*/
+/*	$OpenBSD: unix.c,v 1.4 1996/10/15 08:07:58 downsj Exp $	*/
 /* vi:set ts=4 sw=4:
  *
  * VIM - Vi IMproved		by Bram Moolenaar
@@ -413,13 +413,12 @@ deathtrap SIGDEFARG(sigarg)
 		may_core_dump();
 		exit(7);
 	}
-	if (entered)
+	if (entered++)
 	{
 		OUTSTR("Vim: Double signal, exiting\n");
 		flushbuf();
 		getout(1);
 	}
-	++entered;
 
 	sprintf((char *)IObuff, "Vim: Caught %s %s\n",
 #ifdef SIGHASARG
@@ -2125,8 +2124,8 @@ call_shell(cmd, options)
 							 RealWaitForChar(fromshell_fd, 10); ++read_count)
 					{
 						len = read(fromshell_fd, (char *)buffer,
-															  (size_t)BUFLEN);
-						if (len == 0)				/* end of file */
+														(size_t)(BUFLEN - 1));
+						if (len <= 0)				/* end of file or error */
 							goto finished;
 						buffer[len] = NUL;
 						msg_outstr(buffer);
diff --git a/usr.bin/vim/version.c b/usr.bin/vim/version.c
index dc8bd6b0353..9323bced90c 100644
--- a/usr.bin/vim/version.c
+++ b/usr.bin/vim/version.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: version.c,v 1.3 1996/10/14 03:55:34 downsj Exp $	*/
+/*	$OpenBSD: version.c,v 1.4 1996/10/15 08:08:00 downsj Exp $	*/
 /* vi:set ts=4 sw=4:
  * vi:set comments=sbl\:*\ -,mb\:*,el\:*\ -,sr\:/\*,mb\:*,el\:*\/,fb\:- :
  *
@@ -46,6 +46,14 @@
  * - Fixed: a ":global" that requires input, could not be broken with CTRL-C.
  * - Fixed: "1H" and "1L" were off by one line.
  * - Included version 1.5 of ctags.
+ * Last minute fixes:
+ * - Fixed: When using ^X^C in insert mode and then entering insert mode
+ *   again, the ^X mode message is shown when it shouldn't.
+ * - Fixed: In GUI, when reading the output from an external command, there
+ *   was no check for an error, which could result in an endless loop.
+ * - Small correction in src/ctags/ctags.c for MS-DOS.
+ * - Fixed for Unix: Would never detect a triple signal.
+ * - Removed ":mfstat" command, it's for debugging only.
  *
  * Changes between version 4.3 BETA and 4.4 BETA:
  * - Moved outputting newline from getout() to mch_windexit().  Helps when
@@ -330,9 +338,9 @@
 
 char		   *Version = "VIM 4.5";
 #ifdef HAVE_DATE_TIME
-char		   *longVersion = "VIM - Vi IMproved 4.5 (1996 Oct 7, compiled " __DATE__ " " __TIME__ ")";
+char		   *longVersion = "VIM - Vi IMproved 4.5 (1996 Oct 12, compiled " __DATE__ " " __TIME__ ")";
 #else
-char		   *longVersion = "VIM - Vi IMproved 4.5 (1996 Oct 7)";
+char		   *longVersion = "VIM - Vi IMproved 4.5 (1996 Oct 12)";
 #endif
 
 static void version_msg __ARGS((char *s));
diff --git a/usr.bin/vim/version.h b/usr.bin/vim/version.h
index c85ebbba4e0..6c6741c2607 100644
--- a/usr.bin/vim/version.h
+++ b/usr.bin/vim/version.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: version.h,v 1.3 1996/10/14 03:55:34 downsj Exp $	*/
+/*	$OpenBSD: version.h,v 1.4 1996/10/15 08:08:02 downsj Exp $	*/
 /* vi:set ts=4 sw=4:
  *
  * VIM - Vi IMproved		by Bram Moolenaar
@@ -25,8 +25,8 @@
 #define VIM_VERSION_MINOR			   5
 #define VIM_VERSION_MINOR_STR		  "5"
 
-#define VIM_VERSION_BUILD			   1
-#define VIM_VERSION_BUILD_STR		  "1"
+#define VIM_VERSION_BUILD			   2
+#define VIM_VERSION_BUILD_STR		  "2"
 
 #define VIM_VERSION_PATCHLEVEL		   0
 #define VIM_VERSION_PATCHLEVEL_STR	  "0"