Bringing in nvi 1.34. Keith is too active.

Reviewed by:	Sean Eric Fagan

20 files changed, 23 insertions, 21 deletions

diff --git a/usr.bin/vi/common/cut.c b/usr.bin/vi/common/cut.c
index 14bbd81..75c5b98 100644
--- a/usr.bin/vi/common/cut.c
+++ b/usr.bin/vi/common/cut.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)cut.c	8.33 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)cut.c	8.34 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/delete.c b/usr.bin/vi/common/delete.c
index 1f18772..a6d0a81 100644
--- a/usr.bin/vi/common/delete.c
+++ b/usr.bin/vi/common/delete.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)delete.c	8.11 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)delete.c	8.12 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/exf.c b/usr.bin/vi/common/exf.c
index d417df1..3718342 100644
--- a/usr.bin/vi/common/exf.c
+++ b/usr.bin/vi/common/exf.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)exf.c	8.96 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)exf.c	8.97 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/vi/common/line.c b/usr.bin/vi/common/line.c
index 9ce348a..847c132 100644
--- a/usr.bin/vi/common/line.c
+++ b/usr.bin/vi/common/line.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)line.c	8.31 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)line.c	8.32 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/log.c b/usr.bin/vi/common/log.c
index fe9a6b1..b3a2295 100644
--- a/usr.bin/vi/common/log.c
+++ b/usr.bin/vi/common/log.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)log.c	8.17 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)log.c	8.18 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/main.c b/usr.bin/vi/common/main.c
index b837a6d..4ed059d 100644
--- a/usr.bin/vi/common/main.c
+++ b/usr.bin/vi/common/main.c
@@ -32,13 +32,13 @@
  */
 
 #ifndef lint
-static const char copyright[] =
+static char copyright[] =
 "@(#) Copyright (c) 1992, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static const char sccsid[] = "@(#)main.c	8.105 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)main.c	8.106 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/vi/common/mark.c b/usr.bin/vi/common/mark.c
index 6461e22..930ce6e 100644
--- a/usr.bin/vi/common/mark.c
+++ b/usr.bin/vi/common/mark.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)mark.c	8.20 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)mark.c	8.21 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/msg.c b/usr.bin/vi/common/msg.c
index 69c4838..36639c1 100644
--- a/usr.bin/vi/common/msg.c
+++ b/usr.bin/vi/common/msg.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)msg.c	8.11 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)msg.c	8.12 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/options.c b/usr.bin/vi/common/options.c
index f96e0ff..089a7b8 100644
--- a/usr.bin/vi/common/options.c
+++ b/usr.bin/vi/common/options.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)options.c	8.65 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)options.c	8.66 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/options_f.c b/usr.bin/vi/common/options_f.c
index 25b7245..bb3cf1b 100644
--- a/usr.bin/vi/common/options_f.c
+++ b/usr.bin/vi/common/options_f.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)options_f.c	8.35 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)options_f.c	8.36 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/put.c b/usr.bin/vi/common/put.c
index 499d637..6ed14a8 100644
--- a/usr.bin/vi/common/put.c
+++ b/usr.bin/vi/common/put.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)put.c	8.10 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)put.c	8.11 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/recover.c b/usr.bin/vi/common/recover.c
index f916fdb..a94b65a 100644
--- a/usr.bin/vi/common/recover.c
+++ b/usr.bin/vi/common/recover.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)recover.c	8.73 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)recover.c	8.74 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/vi/common/screen.c b/usr.bin/vi/common/screen.c
index 7b95173..2756969 100644
--- a/usr.bin/vi/common/screen.c
+++ b/usr.bin/vi/common/screen.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)screen.c	8.66 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)screen.c	8.67 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/search.c b/usr.bin/vi/common/search.c
index 964c413..f7e96eb 100644
--- a/usr.bin/vi/common/search.c
+++ b/usr.bin/vi/common/search.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)search.c	8.47 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)search.c	8.48 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/seq.c b/usr.bin/vi/common/seq.c
index cc47fd1..75b67a6 100644
--- a/usr.bin/vi/common/seq.c
+++ b/usr.bin/vi/common/seq.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)seq.c	8.32 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)seq.c	8.33 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/signal.c b/usr.bin/vi/common/signal.c
index ff03bd6..47a5e5b 100644
--- a/usr.bin/vi/common/signal.c
+++ b/usr.bin/vi/common/signal.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)signal.c	8.33 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)signal.c	8.34 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/queue.h>
diff --git a/usr.bin/vi/common/term.c b/usr.bin/vi/common/term.c
index f6e1072..08467a5 100644
--- a/usr.bin/vi/common/term.c
+++ b/usr.bin/vi/common/term.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)term.c	8.80 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)term.c	8.81 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/common/util.c b/usr.bin/vi/common/util.c
index 5223aad..0268c0c 100644
--- a/usr.bin/vi/common/util.c
+++ b/usr.bin/vi/common/util.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static const char sccsid[] = "@(#)util.c	8.73 (Berkeley) 8/17/94";
+static char sccsid[] = "@(#)util.c	8.74 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/docs/README b/usr.bin/vi/docs/README
index 4af7691..0fe3a12 100644
--- a/usr.bin/vi/docs/README
+++ b/usr.bin/vi/docs/README
@@ -1,6 +1,6 @@
-#	@(#)README	8.85 (Berkeley) 8/17/94
+#	@(#)README	8.86 (Berkeley) 8/17/94
 
-This is the README for version 1.33 of nex/nvi, a freely redistributable
+This is the README for version 1.34 of nex/nvi, a freely redistributable
 replacement for the Berkeley ex and vi text editors.  The compressed or
 gzip'd archives for this and future versions, can be retrieved by using
 anonymous ftp to ftp.cs.berkeley.edu, from the file ucb/4bsd/nvi.tar.Z,
diff --git a/usr.bin/vi/docs/changelog b/usr.bin/vi/docs/changelog
index 98a414e..54e98a2 100644
--- a/usr.bin/vi/docs/changelog
+++ b/usr.bin/vi/docs/changelog
@@ -1,3 +1,5 @@
+1.33 -> 1.34 Wed Aug 17 14:37:32 1994 (PUBLICLY AVAILABLE VERSION)
+	+ Back out sccsid string fix, it won't work on SunOS 4.1.
 1.32 -> 1.33 Wed Aug 17 09:31:41 1994 (PUBLICLY AVAILABLE VERSION)
 	+ Get back 5K of data space for the sccsid strings.
 	+ Fix bug where cG fix in version 1.31 broke cw cursor positioning