18 files changed, 18 insertions, 98 deletions
diff --git a/usr.bin/vi/common/api.c b/usr.bin/vi/common/api.c
index 23ed2ec0ac7..0e6799a6b51 100644
--- a/usr.bin/vi/common/api.c
+++ b/usr.bin/vi/common/api.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: api.c,v 1.13 2007/05/14 12:32:29 pyr Exp $	*/
+/*	$OpenBSD: api.c,v 1.14 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -13,10 +13,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)api.c	8.26 (Berkeley) 10/14/96";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/time.h>
diff --git a/usr.bin/vi/common/cut.c b/usr.bin/vi/common/cut.c
index f263a3c0b19..5c59fb713ae 100644
--- a/usr.bin/vi/common/cut.c
+++ b/usr.bin/vi/common/cut.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cut.c,v 1.10 2006/01/08 21:09:13 miod Exp $	*/
+/*	$OpenBSD: cut.c,v 1.11 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)cut.c	10.10 (Berkeley) 9/15/96";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 
diff --git a/usr.bin/vi/common/delete.c b/usr.bin/vi/common/delete.c
index c3dde6c9b66..b580e93d4e7 100644
--- a/usr.bin/vi/common/delete.c
+++ b/usr.bin/vi/common/delete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: delete.c,v 1.7 2002/02/16 21:27:56 millert Exp $	*/
+/*	$OpenBSD: delete.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)delete.c	10.12 (Berkeley) 10/23/96";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 
diff --git a/usr.bin/vi/common/exf.c b/usr.bin/vi/common/exf.c
index 4444e59cbe6..9eba430c3f9 100644
--- a/usr.bin/vi/common/exf.c
+++ b/usr.bin/vi/common/exf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exf.c,v 1.24 2007/11/24 12:59:28 jmc Exp $	*/
+/*	$OpenBSD: exf.c,v 1.25 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)exf.c	10.49 (Berkeley) 10/10/96";
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/types.h>		/* XXX: param.h may not have included types.h */
 #include <sys/queue.h>
diff --git a/usr.bin/vi/common/key.c b/usr.bin/vi/common/key.c
index 11384a2b5e3..5a93f7fa856 100644
--- a/usr.bin/vi/common/key.c
+++ b/usr.bin/vi/common/key.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.c,v 1.9 2006/01/08 21:08:27 miod Exp $	*/
+/*	$OpenBSD: key.c,v 1.10 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)key.c	10.33 (Berkeley) 9/24/96";
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/time.h>
diff --git a/usr.bin/vi/common/line.c b/usr.bin/vi/common/line.c
index 4ef445b268d..b536c829c7e 100644
--- a/usr.bin/vi/common/line.c
+++ b/usr.bin/vi/common/line.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: line.c,v 1.8 2007/05/14 12:32:29 pyr Exp $	*/
+/*	$OpenBSD: line.c,v 1.9 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)line.c	10.21 (Berkeley) 9/15/96";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/time.h>
diff --git a/usr.bin/vi/common/log.c b/usr.bin/vi/common/log.c
index 8a9be397fe6..830d7d87a29 100644
--- a/usr.bin/vi/common/log.c
+++ b/usr.bin/vi/common/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.4 2002/02/16 21:27:57 millert Exp $	*/
+/*	$OpenBSD: log.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)log.c	10.8 (Berkeley) 3/6/96";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
diff --git a/usr.bin/vi/common/main.c b/usr.bin/vi/common/main.c
index e50581972d2..73957ef3e11 100644
--- a/usr.bin/vi/common/main.c
+++ b/usr.bin/vi/common/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.18 2009/02/01 21:57:21 miod Exp $	*/
+/*	$OpenBSD: main.c,v 1.19 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -11,18 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n\
-@(#) Copyright (c) 1992, 1993, 1994, 1995, 1996\n\
-	Keith Bostic.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static const char sccsid[] = "@(#)main.c	10.48 (Berkeley) 10/11/96";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
diff --git a/usr.bin/vi/common/mark.c b/usr.bin/vi/common/mark.c
index 18709253911..ee0203c7715 100644
--- a/usr.bin/vi/common/mark.c
+++ b/usr.bin/vi/common/mark.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mark.c,v 1.7 2006/01/08 21:05:39 miod Exp $	*/
+/*	$OpenBSD: mark.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)mark.c	10.13 (Berkeley) 7/19/96";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 
diff --git a/usr.bin/vi/common/msg.c b/usr.bin/vi/common/msg.c
index 61d5efefa62..d11c9b98235 100644
--- a/usr.bin/vi/common/msg.c
+++ b/usr.bin/vi/common/msg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msg.c,v 1.17 2007/03/20 03:56:13 tedu Exp $	*/
+/*	$OpenBSD: msg.c,v 1.18 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)msg.c	10.48 (Berkeley) 9/15/96";
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/types.h>		/* XXX: param.h may not have included types.h */
 #include <sys/queue.h>
diff --git a/usr.bin/vi/common/options.c b/usr.bin/vi/common/options.c
index dd820aa1b0c..538b6bfcd09 100644
--- a/usr.bin/vi/common/options.c
+++ b/usr.bin/vi/common/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.13 2006/03/11 07:04:53 ray Exp $	*/
+/*	$OpenBSD: options.c,v 1.14 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)options.c	10.51 (Berkeley) 10/14/96";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
diff --git a/usr.bin/vi/common/options_f.c b/usr.bin/vi/common/options_f.c
index c290fb3e3ed..2adfefa574f 100644
--- a/usr.bin/vi/common/options_f.c
+++ b/usr.bin/vi/common/options_f.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options_f.c,v 1.6 2002/02/16 21:27:57 millert Exp $	*/
+/*	$OpenBSD: options_f.c,v 1.7 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)options_f.c	10.25 (Berkeley) 7/12/96";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
diff --git a/usr.bin/vi/common/put.c b/usr.bin/vi/common/put.c
index fcf15c2c06e..4aa8a7fae92 100644
--- a/usr.bin/vi/common/put.c
+++ b/usr.bin/vi/common/put.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: put.c,v 1.9 2007/05/14 12:32:29 pyr Exp $	*/
+/*	$OpenBSD: put.c,v 1.10 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)put.c	10.11 (Berkeley) 9/23/96";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 
diff --git a/usr.bin/vi/common/recover.c b/usr.bin/vi/common/recover.c
index 46373aea904..8adb35d384a 100644
--- a/usr.bin/vi/common/recover.c
+++ b/usr.bin/vi/common/recover.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: recover.c,v 1.14 2008/09/25 11:37:03 sobrado Exp $	*/
+/*	$OpenBSD: recover.c,v 1.15 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)recover.c	10.21 (Berkeley) 9/15/96";
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/types.h>		/* XXX: param.h may not have included types.h */
 #include <sys/queue.h>
diff --git a/usr.bin/vi/common/screen.c b/usr.bin/vi/common/screen.c
index d82fb005c5c..d248e39b5e5 100644
--- a/usr.bin/vi/common/screen.c
+++ b/usr.bin/vi/common/screen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: screen.c,v 1.7 2005/10/17 19:12:16 otto Exp $	*/
+/*	$OpenBSD: screen.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)screen.c	10.15 (Berkeley) 9/15/96";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/time.h>
diff --git a/usr.bin/vi/common/search.c b/usr.bin/vi/common/search.c
index d39737acf87..a41ac2102b3 100644
--- a/usr.bin/vi/common/search.c
+++ b/usr.bin/vi/common/search.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.c,v 1.8 2006/01/08 21:05:39 miod Exp $	*/
+/*	$OpenBSD: search.c,v 1.9 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)search.c	10.25 (Berkeley) 6/30/96";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/queue.h>
 
diff --git a/usr.bin/vi/common/seq.c b/usr.bin/vi/common/seq.c
index 268c46c5b3d..b16c7bf2f1c 100644
--- a/usr.bin/vi/common/seq.c
+++ b/usr.bin/vi/common/seq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: seq.c,v 1.7 2005/10/17 19:12:16 otto Exp $	*/
+/*	$OpenBSD: seq.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)seq.c	10.10 (Berkeley) 3/30/96";
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/queue.h>
 
diff --git a/usr.bin/vi/common/util.c b/usr.bin/vi/common/util.c
index c4d177b2337..3d5f298d88d 100644
--- a/usr.bin/vi/common/util.c
+++ b/usr.bin/vi/common/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.7 2002/02/19 19:39:39 millert Exp $	*/
+/*	$OpenBSD: util.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -11,10 +11,6 @@
 
 #include "config.h"
 
-#ifndef lint
-static const char sccsid[] = "@(#)util.c	10.11 (Berkeley) 9/15/96";
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/queue.h>