Change the flash option to be off by default. Now that xterm has the flash

capability in terminfo, vi was using it instead of beeping, but it is too slow
for some machines.

ok deraadt

2 files changed, 5 insertions, 5 deletions

diff --git a/usr.bin/vi/common/options.c b/usr.bin/vi/common/options.c
index 538b6bfcd09..6edfd20c0c3 100644
--- a/usr.bin/vi/common/options.c
+++ b/usr.bin/vi/common/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.14 2009/10/27 23:59:47 deraadt Exp $	*/
+/*	$OpenBSD: options.c,v 1.15 2009/11/22 17:12:40 nicm Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -77,7 +77,7 @@ OPTLIST const optlist[] = {
 /* O_FILEC	  4.4BSD */
 	{"filec",	NULL,		OPT_STR,	0},
 /* O_FLASH	    HPUX */
-	{"flash",	NULL,		OPT_1BOOL,	0},
+	{"flash",	NULL,		OPT_0BOOL,	0},
 /* O_HARDTABS	    4BSD */
 	{"hardtabs",	NULL,		OPT_NUM,	0},
 /* O_ICLOWER	  4.4BSD */
diff --git a/usr.bin/vi/docs/USD.doc/vi.man/vi.1 b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
index 1155c295305..73d78b54653 100644
--- a/usr.bin/vi/docs/USD.doc/vi.man/vi.1
+++ b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.1,v 1.41 2009/10/20 09:54:47 sobrado Exp $
+.\"	$OpenBSD: vi.1,v 1.42 2009/11/22 17:12:40 nicm Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -14,7 +14,7 @@
 .\"
 .\"     @(#)vi.1	8.51 (Berkeley) 10/10/96
 .\"
-.Dd $Mdocdate: October 20 2009 $
+.Dd $Mdocdate: November 22 2009 $
 .Dt VI 1
 .Os
 .Sh NAME
@@ -1841,7 +1841,7 @@ See
 for more information on regular expressions.
 .It Cm filec Bq no default
 Set the character to perform file path completion on the colon command line.
-.It Cm flash Bq on
+.It Cm flash Bq off
 Flash the screen instead of beeping the keyboard on error.
 .It Cm hardtabs , ht Bq 0
 Set the spacing between hardware tab settings.