summaryrefslogtreecommitdiff
path: root/usr.bin/vi
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/vi')
-rw-r--r--usr.bin/vi/catalog/dump.c12
-rw-r--r--usr.bin/vi/cl/cl_bsd.c6
-rw-r--r--usr.bin/vi/cl/cl_funcs.c6
-rw-r--r--usr.bin/vi/cl/cl_main.c6
-rw-r--r--usr.bin/vi/cl/cl_read.c6
-rw-r--r--usr.bin/vi/cl/cl_screen.c6
-rw-r--r--usr.bin/vi/cl/cl_term.c6
-rw-r--r--usr.bin/vi/common/api.c6
-rw-r--r--usr.bin/vi/common/cut.c6
-rw-r--r--usr.bin/vi/common/delete.c6
-rw-r--r--usr.bin/vi/common/exf.c6
-rw-r--r--usr.bin/vi/common/key.c6
-rw-r--r--usr.bin/vi/common/line.c6
-rw-r--r--usr.bin/vi/common/log.c6
-rw-r--r--usr.bin/vi/common/main.c14
-rw-r--r--usr.bin/vi/common/mark.c6
-rw-r--r--usr.bin/vi/common/msg.c6
-rw-r--r--usr.bin/vi/common/options.c6
-rw-r--r--usr.bin/vi/common/options_f.c6
-rw-r--r--usr.bin/vi/common/put.c6
-rw-r--r--usr.bin/vi/common/recover.c6
-rw-r--r--usr.bin/vi/common/screen.c6
-rw-r--r--usr.bin/vi/common/search.c6
-rw-r--r--usr.bin/vi/common/seq.c6
-rw-r--r--usr.bin/vi/common/util.c6
-rw-r--r--usr.bin/vi/ex/ex.c6
-rw-r--r--usr.bin/vi/ex/ex_abbrev.c6
-rw-r--r--usr.bin/vi/ex/ex_append.c6
-rw-r--r--usr.bin/vi/ex/ex_args.c6
-rw-r--r--usr.bin/vi/ex/ex_argv.c6
-rw-r--r--usr.bin/vi/ex/ex_at.c6
-rw-r--r--usr.bin/vi/ex/ex_bang.c6
-rw-r--r--usr.bin/vi/ex/ex_cd.c6
-rw-r--r--usr.bin/vi/ex/ex_cmd.c6
-rw-r--r--usr.bin/vi/ex/ex_cscope.c6
-rw-r--r--usr.bin/vi/ex/ex_delete.c6
-rw-r--r--usr.bin/vi/ex/ex_display.c6
-rw-r--r--usr.bin/vi/ex/ex_edit.c6
-rw-r--r--usr.bin/vi/ex/ex_equal.c6
-rw-r--r--usr.bin/vi/ex/ex_file.c6
-rw-r--r--usr.bin/vi/ex/ex_filter.c6
-rw-r--r--usr.bin/vi/ex/ex_global.c6
-rw-r--r--usr.bin/vi/ex/ex_init.c6
-rw-r--r--usr.bin/vi/ex/ex_join.c6
-rw-r--r--usr.bin/vi/ex/ex_map.c6
-rw-r--r--usr.bin/vi/ex/ex_mark.c6
-rw-r--r--usr.bin/vi/ex/ex_mkexrc.c6
-rw-r--r--usr.bin/vi/ex/ex_move.c6
-rw-r--r--usr.bin/vi/ex/ex_open.c6
-rw-r--r--usr.bin/vi/ex/ex_perl.c6
-rw-r--r--usr.bin/vi/ex/ex_preserve.c6
-rw-r--r--usr.bin/vi/ex/ex_print.c6
-rw-r--r--usr.bin/vi/ex/ex_put.c6
-rw-r--r--usr.bin/vi/ex/ex_quit.c6
-rw-r--r--usr.bin/vi/ex/ex_read.c6
-rw-r--r--usr.bin/vi/ex/ex_screen.c6
-rw-r--r--usr.bin/vi/ex/ex_script.c6
-rw-r--r--usr.bin/vi/ex/ex_set.c6
-rw-r--r--usr.bin/vi/ex/ex_shell.c6
-rw-r--r--usr.bin/vi/ex/ex_shift.c7
-rw-r--r--usr.bin/vi/ex/ex_source.c6
-rw-r--r--usr.bin/vi/ex/ex_stop.c6
-rw-r--r--usr.bin/vi/ex/ex_subst.c6
-rw-r--r--usr.bin/vi/ex/ex_tag.c6
-rw-r--r--usr.bin/vi/ex/ex_tcl.c6
-rw-r--r--usr.bin/vi/ex/ex_txt.c6
-rw-r--r--usr.bin/vi/ex/ex_undo.c6
-rw-r--r--usr.bin/vi/ex/ex_usage.c6
-rw-r--r--usr.bin/vi/ex/ex_util.c6
-rw-r--r--usr.bin/vi/ex/ex_version.c6
-rw-r--r--usr.bin/vi/ex/ex_visual.c6
-rw-r--r--usr.bin/vi/ex/ex_write.c6
-rw-r--r--usr.bin/vi/ex/ex_yank.c6
-rw-r--r--usr.bin/vi/ex/ex_z.c6
-rw-r--r--usr.bin/vi/perl_api/perl.xs6
-rw-r--r--usr.bin/vi/perl_api/perlsfio.c6
-rw-r--r--usr.bin/vi/vi/getc.c6
-rw-r--r--usr.bin/vi/vi/v_at.c6
-rw-r--r--usr.bin/vi/vi/v_ch.c6
-rw-r--r--usr.bin/vi/vi/v_cmd.c6
-rw-r--r--usr.bin/vi/vi/v_delete.c6
-rw-r--r--usr.bin/vi/vi/v_ex.c6
-rw-r--r--usr.bin/vi/vi/v_increment.c6
-rw-r--r--usr.bin/vi/vi/v_init.c6
-rw-r--r--usr.bin/vi/vi/v_itxt.c6
-rw-r--r--usr.bin/vi/vi/v_left.c6
-rw-r--r--usr.bin/vi/vi/v_mark.c6
-rw-r--r--usr.bin/vi/vi/v_match.c6
-rw-r--r--usr.bin/vi/vi/v_paragraph.c6
-rw-r--r--usr.bin/vi/vi/v_put.c6
-rw-r--r--usr.bin/vi/vi/v_redraw.c6
-rw-r--r--usr.bin/vi/vi/v_replace.c6
-rw-r--r--usr.bin/vi/vi/v_right.c6
-rw-r--r--usr.bin/vi/vi/v_screen.c6
-rw-r--r--usr.bin/vi/vi/v_scroll.c6
-rw-r--r--usr.bin/vi/vi/v_search.c6
-rw-r--r--usr.bin/vi/vi/v_section.c6
-rw-r--r--usr.bin/vi/vi/v_sentence.c6
-rw-r--r--usr.bin/vi/vi/v_status.c6
-rw-r--r--usr.bin/vi/vi/v_txt.c6
-rw-r--r--usr.bin/vi/vi/v_ulcase.c6
-rw-r--r--usr.bin/vi/vi/v_undo.c6
-rw-r--r--usr.bin/vi/vi/v_util.c6
-rw-r--r--usr.bin/vi/vi/v_word.c6
-rw-r--r--usr.bin/vi/vi/v_xchar.c6
-rw-r--r--usr.bin/vi/vi/v_yank.c6
-rw-r--r--usr.bin/vi/vi/v_z.c6
-rw-r--r--usr.bin/vi/vi/v_zexit.c6
-rw-r--r--usr.bin/vi/vi/vi.c6
-rw-r--r--usr.bin/vi/vi/vs_line.c6
-rw-r--r--usr.bin/vi/vi/vs_msg.c6
-rw-r--r--usr.bin/vi/vi/vs_refresh.c6
-rw-r--r--usr.bin/vi/vi/vs_relative.c6
-rw-r--r--usr.bin/vi/vi/vs_smap.c6
-rw-r--r--usr.bin/vi/vi/vs_split.c6
115 files changed, 115 insertions, 590 deletions
diff --git a/usr.bin/vi/catalog/dump.c b/usr.bin/vi/catalog/dump.c
index 56e99826dc8..6897dbec609 100644
--- a/usr.bin/vi/catalog/dump.c
+++ b/usr.bin/vi/catalog/dump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dump.c,v 1.5 2008/03/28 17:58:20 jasper Exp $ */
+/* $OpenBSD: dump.c,v 1.6 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-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 char sccsid[] = "@(#)dump.c 8.1 (Berkeley) 8/31/94";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdio.h>
diff --git a/usr.bin/vi/cl/cl_bsd.c b/usr.bin/vi/cl/cl_bsd.c
index da525ae939a..768e49815e4 100644
--- a/usr.bin/vi/cl/cl_bsd.c
+++ b/usr.bin/vi/cl/cl_bsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_bsd.c,v 1.9 2006/03/11 06:58:00 ray Exp $ */
+/* $OpenBSD: cl_bsd.c,v 1.10 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1995, 1996
@@ -9,10 +9,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)cl_bsd.c 8.29 (Berkeley) 7/1/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/cl/cl_funcs.c b/usr.bin/vi/cl/cl_funcs.c
index 92985444ce0..ba9bf5918ed 100644
--- a/usr.bin/vi/cl/cl_funcs.c
+++ b/usr.bin/vi/cl/cl_funcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_funcs.c,v 1.13 2009/01/28 13:02:22 sobrado Exp $ */
+/* $OpenBSD: cl_funcs.c,v 1.14 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[] = "@(#)cl_funcs.c 10.50 (Berkeley) 9/24/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/cl/cl_main.c b/usr.bin/vi/cl/cl_main.c
index 405a10b6988..fa5422c6a19 100644
--- a/usr.bin/vi/cl/cl_main.c
+++ b/usr.bin/vi/cl/cl_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_main.c,v 1.19 2008/03/28 17:58:20 jasper Exp $ */
+/* $OpenBSD: cl_main.c,v 1.20 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[] = "@(#)cl_main.c 10.36 (Berkeley) 10/14/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/cl/cl_read.c b/usr.bin/vi/cl/cl_read.c
index 6edc55197ea..dfd27de60d0 100644
--- a/usr.bin/vi/cl/cl_read.c
+++ b/usr.bin/vi/cl/cl_read.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_read.c,v 1.17 2009/06/10 14:03:18 millert Exp $ */
+/* $OpenBSD: cl_read.c,v 1.18 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[] = "@(#)cl_read.c 10.15 (Berkeley) 9/24/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/cl/cl_screen.c b/usr.bin/vi/cl/cl_screen.c
index 78013b9eb73..610f5bef919 100644
--- a/usr.bin/vi/cl/cl_screen.c
+++ b/usr.bin/vi/cl/cl_screen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_screen.c,v 1.18 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: cl_screen.c,v 1.19 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[] = "@(#)cl_screen.c 10.49 (Berkeley) 9/24/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/cl/cl_term.c b/usr.bin/vi/cl/cl_term.c
index 6d1163a4bdd..69d1cfc6c9b 100644
--- a/usr.bin/vi/cl/cl_term.c
+++ b/usr.bin/vi/cl/cl_term.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_term.c,v 1.15 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: cl_term.c,v 1.16 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[] = "@(#)cl_term.c 10.22 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/queue.h>
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>
diff --git a/usr.bin/vi/ex/ex.c b/usr.bin/vi/ex/ex.c
index 5c892e487f3..6c352e3b7c7 100644
--- a/usr.bin/vi/ex/ex.c
+++ b/usr.bin/vi/ex/ex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex.c,v 1.15 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex.c,v 1.16 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[] = "@(#)ex.c 10.57 (Berkeley) 10/10/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/ex/ex_abbrev.c b/usr.bin/vi/ex/ex_abbrev.c
index a5a9d6c2e71..706a9548a93 100644
--- a/usr.bin/vi/ex/ex_abbrev.c
+++ b/usr.bin/vi/ex/ex_abbrev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_abbrev.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_abbrev.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[] = "@(#)ex_abbrev.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_append.c b/usr.bin/vi/ex/ex_append.c
index 1016d319c5d..686ed84b370 100644
--- a/usr.bin/vi/ex/ex_append.c
+++ b/usr.bin/vi/ex/ex_append.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_append.c,v 1.7 2005/10/17 19:12:16 otto Exp $ */
+/* $OpenBSD: ex_append.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[] = "@(#)ex_append.c 10.30 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_args.c b/usr.bin/vi/ex/ex_args.c
index 213dae2671f..277dfac70cc 100644
--- a/usr.bin/vi/ex/ex_args.c
+++ b/usr.bin/vi/ex/ex_args.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_args.c,v 1.6 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex_args.c,v 1.7 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[] = "@(#)ex_args.c 10.16 (Berkeley) 7/13/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_argv.c b/usr.bin/vi/ex/ex_argv.c
index a7f441a9675..871662b78de 100644
--- a/usr.bin/vi/ex/ex_argv.c
+++ b/usr.bin/vi/ex/ex_argv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_argv.c,v 1.12 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex_argv.c,v 1.13 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[] = "@(#)ex_argv.c 10.26 (Berkeley) 9/20/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_at.c b/usr.bin/vi/ex/ex_at.c
index 71ce279f696..e3fd1832146 100644
--- a/usr.bin/vi/ex/ex_at.c
+++ b/usr.bin/vi/ex/ex_at.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_at.c,v 1.7 2005/10/17 19:12:16 otto Exp $ */
+/* $OpenBSD: ex_at.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[] = "@(#)ex_at.c 10.12 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_bang.c b/usr.bin/vi/ex/ex_bang.c
index 2532b7be7ed..267e02631b1 100644
--- a/usr.bin/vi/ex/ex_bang.c
+++ b/usr.bin/vi/ex/ex_bang.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_bang.c,v 1.6 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: ex_bang.c,v 1.7 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[] = "@(#)ex_bang.c 10.33 (Berkeley) 9/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_cd.c b/usr.bin/vi/ex/ex_cd.c
index d2782413331..699c510309b 100644
--- a/usr.bin/vi/ex/ex_cd.c
+++ b/usr.bin/vi/ex/ex_cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_cd.c,v 1.8 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: ex_cd.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[] = "@(#)ex_cd.c 10.10 (Berkeley) 8/12/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_cmd.c b/usr.bin/vi/ex/ex_cmd.c
index 3a5d42d1395..d4a9b491a48 100644
--- a/usr.bin/vi/ex/ex_cmd.c
+++ b/usr.bin/vi/ex/ex_cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_cmd.c,v 1.5 2001/01/29 01:58:42 niklas Exp $ */
+/* $OpenBSD: ex_cmd.c,v 1.6 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[] = "@(#)ex_cmd.c 10.20 (Berkeley) 10/10/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_cscope.c b/usr.bin/vi/ex/ex_cscope.c
index 56093878711..78819f3dda4 100644
--- a/usr.bin/vi/ex/ex_cscope.c
+++ b/usr.bin/vi/ex/ex_cscope.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_cscope.c,v 1.15 2008/08/29 13:07:13 oga Exp $ */
+/* $OpenBSD: ex_cscope.c,v 1.16 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1994, 1996
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_cscope.c 10.13 (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/ex/ex_delete.c b/usr.bin/vi/ex/ex_delete.c
index f57b8d3bbb1..d8fc7868c23 100644
--- a/usr.bin/vi/ex/ex_delete.c
+++ b/usr.bin/vi/ex/ex_delete.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_delete.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_delete.c,v 1.6 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[] = "@(#)ex_delete.c 10.9 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_display.c b/usr.bin/vi/ex/ex_display.c
index 720dbeea8ff..ce5c0ed4520 100644
--- a/usr.bin/vi/ex/ex_display.c
+++ b/usr.bin/vi/ex/ex_display.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_display.c,v 1.6 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex_display.c,v 1.7 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[] = "@(#)ex_display.c 10.12 (Berkeley) 4/10/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_edit.c b/usr.bin/vi/ex/ex_edit.c
index 1ff292994a8..384457de3fb 100644
--- a/usr.bin/vi/ex/ex_edit.c
+++ b/usr.bin/vi/ex/ex_edit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_edit.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_edit.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[] = "@(#)ex_edit.c 10.10 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_equal.c b/usr.bin/vi/ex/ex_equal.c
index 6a1be656e4f..9878260a34e 100644
--- a/usr.bin/vi/ex/ex_equal.c
+++ b/usr.bin/vi/ex/ex_equal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_equal.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_equal.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[] = "@(#)ex_equal.c 10.10 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_file.c b/usr.bin/vi/ex/ex_file.c
index ae5b79e5d5e..86199cf0b22 100644
--- a/usr.bin/vi/ex/ex_file.c
+++ b/usr.bin/vi/ex/ex_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_file.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_file.c,v 1.6 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[] = "@(#)ex_file.c 10.12 (Berkeley) 7/12/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_filter.c b/usr.bin/vi/ex/ex_filter.c
index 8e0ede942b7..b4951a95f53 100644
--- a/usr.bin/vi/ex/ex_filter.c
+++ b/usr.bin/vi/ex/ex_filter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_filter.c,v 1.9 2006/12/21 21:38:17 otto Exp $ */
+/* $OpenBSD: ex_filter.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[] = "@(#)ex_filter.c 10.34 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/vi/ex/ex_global.c b/usr.bin/vi/ex/ex_global.c
index 0fb2c6fe617..842012112e6 100644
--- a/usr.bin/vi/ex/ex_global.c
+++ b/usr.bin/vi/ex/ex_global.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_global.c,v 1.10 2007/05/14 12:32:29 pyr Exp $ */
+/* $OpenBSD: ex_global.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[] = "@(#)ex_global.c 10.22 (Berkeley) 10/10/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_init.c b/usr.bin/vi/ex/ex_init.c
index b6b5fd7c8f1..2d18324244f 100644
--- a/usr.bin/vi/ex/ex_init.c
+++ b/usr.bin/vi/ex/ex_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_init.c,v 1.8 2002/12/15 13:30:17 henning Exp $ */
+/* $OpenBSD: ex_init.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[] = "@(#)ex_init.c 10.26 (Berkeley) 8/12/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/ex/ex_join.c b/usr.bin/vi/ex/ex_join.c
index 2629f967db7..0ab30889290 100644
--- a/usr.bin/vi/ex/ex_join.c
+++ b/usr.bin/vi/ex/ex_join.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_join.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_join.c,v 1.6 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[] = "@(#)ex_join.c 10.10 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_map.c b/usr.bin/vi/ex/ex_map.c
index 5389374a917..f9b1aba4db7 100644
--- a/usr.bin/vi/ex/ex_map.c
+++ b/usr.bin/vi/ex/ex_map.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_map.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_map.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[] = "@(#)ex_map.c 10.9 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_mark.c b/usr.bin/vi/ex/ex_mark.c
index 0bc0795afbf..1dc75085e58 100644
--- a/usr.bin/vi/ex/ex_mark.c
+++ b/usr.bin/vi/ex/ex_mark.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_mark.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_mark.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[] = "@(#)ex_mark.c 10.8 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_mkexrc.c b/usr.bin/vi/ex/ex_mkexrc.c
index 35347750e0f..66db029d0a5 100644
--- a/usr.bin/vi/ex/ex_mkexrc.c
+++ b/usr.bin/vi/ex/ex_mkexrc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_mkexrc.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_mkexrc.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[] = "@(#)ex_mkexrc.c 10.11 (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/ex/ex_move.c b/usr.bin/vi/ex/ex_move.c
index 5155f4889db..95e8261e529 100644
--- a/usr.bin/vi/ex/ex_move.c
+++ b/usr.bin/vi/ex/ex_move.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_move.c,v 1.7 2005/10/17 19:12:16 otto Exp $ */
+/* $OpenBSD: ex_move.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[] = "@(#)ex_move.c 10.10 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_open.c b/usr.bin/vi/ex/ex_open.c
index b21e3899c54..ed155cbf693 100644
--- a/usr.bin/vi/ex/ex_open.c
+++ b/usr.bin/vi/ex/ex_open.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_open.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_open.c,v 1.5 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[] = "@(#)ex_open.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_perl.c b/usr.bin/vi/ex/ex_perl.c
index b47341abb50..53571a6f732 100644
--- a/usr.bin/vi/ex/ex_perl.c
+++ b/usr.bin/vi/ex/ex_perl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_perl.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_perl.c,v 1.6 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -15,10 +15,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_perl.c 8.10 (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/ex/ex_preserve.c b/usr.bin/vi/ex/ex_preserve.c
index 129e93d728d..d70352b60c5 100644
--- a/usr.bin/vi/ex/ex_preserve.c
+++ b/usr.bin/vi/ex/ex_preserve.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_preserve.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_preserve.c,v 1.5 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[] = "@(#)ex_preserve.c 10.12 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_print.c b/usr.bin/vi/ex/ex_print.c
index 7f3f1166da5..8cac5cf4115 100644
--- a/usr.bin/vi/ex/ex_print.c
+++ b/usr.bin/vi/ex/ex_print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_print.c,v 1.8 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex_print.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[] = "@(#)ex_print.c 10.18 (Berkeley) 5/12/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_put.c b/usr.bin/vi/ex/ex_put.c
index 6af96f2ec38..3a5707638e8 100644
--- a/usr.bin/vi/ex/ex_put.c
+++ b/usr.bin/vi/ex/ex_put.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_put.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_put.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[] = "@(#)ex_put.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_quit.c b/usr.bin/vi/ex/ex_quit.c
index 5a2006a74d9..3d62d5574b4 100644
--- a/usr.bin/vi/ex/ex_quit.c
+++ b/usr.bin/vi/ex/ex_quit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_quit.c,v 1.3 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_quit.c,v 1.4 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[] = "@(#)ex_quit.c 10.7 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_read.c b/usr.bin/vi/ex/ex_read.c
index 4cbb356060c..c0f2530bff0 100644
--- a/usr.bin/vi/ex/ex_read.c
+++ b/usr.bin/vi/ex/ex_read.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_read.c,v 1.8 2006/03/11 06:58:00 ray Exp $ */
+/* $OpenBSD: ex_read.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[] = "@(#)ex_read.c 10.38 (Berkeley) 8/12/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/ex/ex_screen.c b/usr.bin/vi/ex/ex_screen.c
index 1684fef2b5f..301ee4bfc1b 100644
--- a/usr.bin/vi/ex/ex_screen.c
+++ b/usr.bin/vi/ex/ex_screen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_screen.c,v 1.6 2005/10/17 19:12:16 otto Exp $ */
+/* $OpenBSD: ex_screen.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[] = "@(#)ex_screen.c 10.11 (Berkeley) 6/29/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_script.c b/usr.bin/vi/ex/ex_script.c
index ec0eaa943a4..b551fab3ae2 100644
--- a/usr.bin/vi/ex/ex_script.c
+++ b/usr.bin/vi/ex/ex_script.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_script.c,v 1.15 2009/06/10 14:03:18 millert Exp $ */
+/* $OpenBSD: ex_script.c,v 1.16 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -14,10 +14,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_script.c 10.30 (Berkeley) 9/24/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_set.c b/usr.bin/vi/ex/ex_set.c
index 7902db985d1..fb60a7d698f 100644
--- a/usr.bin/vi/ex/ex_set.c
+++ b/usr.bin/vi/ex/ex_set.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_set.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_set.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[] = "@(#)ex_set.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_shell.c b/usr.bin/vi/ex/ex_shell.c
index a8ff35b4bc4..d9f57da852d 100644
--- a/usr.bin/vi/ex/ex_shell.c
+++ b/usr.bin/vi/ex/ex_shell.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_shell.c,v 1.10 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: ex_shell.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[] = "@(#)ex_shell.c 10.38 (Berkeley) 8/19/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/wait.h>
diff --git a/usr.bin/vi/ex/ex_shift.c b/usr.bin/vi/ex/ex_shift.c
index 523fa875d6f..4bcf384984f 100644
--- a/usr.bin/vi/ex/ex_shift.c
+++ b/usr.bin/vi/ex/ex_shift.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_shift.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_shift.c,v 1.6 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,11 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_shift.c 10.11 (Berkeley) 9/15/96";
-#endif /* not lint */
-
-#include <sys/types.h>
#include <sys/queue.h>
#include <bitstring.h>
diff --git a/usr.bin/vi/ex/ex_source.c b/usr.bin/vi/ex/ex_source.c
index c046a33bb6e..8bd88bb24ac 100644
--- a/usr.bin/vi/ex/ex_source.c
+++ b/usr.bin/vi/ex/ex_source.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_source.c,v 1.6 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_source.c,v 1.7 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[] = "@(#)ex_source.c 10.12 (Berkeley) 8/10/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/ex/ex_stop.c b/usr.bin/vi/ex/ex_stop.c
index 8f62be4aa22..4be5da4c4e2 100644
--- a/usr.bin/vi/ex/ex_stop.c
+++ b/usr.bin/vi/ex/ex_stop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_stop.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_stop.c,v 1.5 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[] = "@(#)ex_stop.c 10.10 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_subst.c b/usr.bin/vi/ex/ex_subst.c
index a41efe298ac..3b2053bac3a 100644
--- a/usr.bin/vi/ex/ex_subst.c
+++ b/usr.bin/vi/ex/ex_subst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_subst.c,v 1.16 2007/03/27 18:24:06 otto Exp $ */
+/* $OpenBSD: ex_subst.c,v 1.17 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[] = "@(#)ex_subst.c 10.37 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_tag.c b/usr.bin/vi/ex/ex_tag.c
index b5d5043b180..734bf30459d 100644
--- a/usr.bin/vi/ex/ex_tag.c
+++ b/usr.bin/vi/ex/ex_tag.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_tag.c,v 1.13 2006/03/11 06:58:00 ray Exp $ */
+/* $OpenBSD: ex_tag.c,v 1.14 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -14,10 +14,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_tag.c 10.36 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h> /* XXX: param.h may not have included types.h */
diff --git a/usr.bin/vi/ex/ex_tcl.c b/usr.bin/vi/ex/ex_tcl.c
index 6538638da48..f78504acb5d 100644
--- a/usr.bin/vi/ex/ex_tcl.c
+++ b/usr.bin/vi/ex/ex_tcl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_tcl.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_tcl.c,v 1.5 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[] = "@(#)ex_tcl.c 8.10 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_txt.c b/usr.bin/vi/ex/ex_txt.c
index c89cf1a4d72..5d6e7b5c776 100644
--- a/usr.bin/vi/ex/ex_txt.c
+++ b/usr.bin/vi/ex/ex_txt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_txt.c,v 1.9 2006/01/08 21:06:38 miod Exp $ */
+/* $OpenBSD: ex_txt.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[] = "@(#)ex_txt.c 10.17 (Berkeley) 10/10/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_undo.c b/usr.bin/vi/ex/ex_undo.c
index d7a5cd3bf43..08579f4dc39 100644
--- a/usr.bin/vi/ex/ex_undo.c
+++ b/usr.bin/vi/ex/ex_undo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_undo.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_undo.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[] = "@(#)ex_undo.c 10.6 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_usage.c b/usr.bin/vi/ex/ex_usage.c
index 951bf7e0ee6..bd87fe14e5b 100644
--- a/usr.bin/vi/ex/ex_usage.c
+++ b/usr.bin/vi/ex/ex_usage.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_usage.c,v 1.6 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex_usage.c,v 1.7 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[] = "@(#)ex_usage.c 10.13 (Berkeley) 5/3/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_util.c b/usr.bin/vi/ex/ex_util.c
index 5e330e049d1..0e1e055b4b0 100644
--- a/usr.bin/vi/ex/ex_util.c
+++ b/usr.bin/vi/ex/ex_util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_util.c,v 1.6 2002/02/17 19:42:34 millert Exp $ */
+/* $OpenBSD: ex_util.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[] = "@(#)ex_util.c 10.23 (Berkeley) 6/19/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/ex/ex_version.c b/usr.bin/vi/ex/ex_version.c
index 3f503eba13f..e1e2128623a 100644
--- a/usr.bin/vi/ex/ex_version.c
+++ b/usr.bin/vi/ex/ex_version.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_version.c,v 1.8 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_version.c,v 1.9 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[] = "@(#)ex_version.c 10.31 (Berkeley) 8/22/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_visual.c b/usr.bin/vi/ex/ex_visual.c
index 74bc5f8846e..5a945474d54 100644
--- a/usr.bin/vi/ex/ex_visual.c
+++ b/usr.bin/vi/ex/ex_visual.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_visual.c,v 1.7 2006/03/11 06:58:00 ray Exp $ */
+/* $OpenBSD: ex_visual.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[] = "@(#)ex_visual.c 10.13 (Berkeley) 6/28/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_write.c b/usr.bin/vi/ex/ex_write.c
index 894583284ac..0f21d3132a9 100644
--- a/usr.bin/vi/ex/ex_write.c
+++ b/usr.bin/vi/ex/ex_write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_write.c,v 1.10 2007/03/20 03:56:13 tedu Exp $ */
+/* $OpenBSD: ex_write.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[] = "@(#)ex_write.c 10.30 (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/ex/ex_yank.c b/usr.bin/vi/ex/ex_yank.c
index 408d9e9ca41..1716d7e1fd2 100644
--- a/usr.bin/vi/ex/ex_yank.c
+++ b/usr.bin/vi/ex/ex_yank.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_yank.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_yank.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[] = "@(#)ex_yank.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_z.c b/usr.bin/vi/ex/ex_z.c
index 00c46196864..1f128216c28 100644
--- a/usr.bin/vi/ex/ex_z.c
+++ b/usr.bin/vi/ex/ex_z.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_z.c,v 1.5 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex_z.c,v 1.6 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[] = "@(#)ex_z.c 10.10 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/perl_api/perl.xs b/usr.bin/vi/perl_api/perl.xs
index 2c41b1f5563..aacc5e6dd61 100644
--- a/usr.bin/vi/perl_api/perl.xs
+++ b/usr.bin/vi/perl_api/perl.xs
@@ -1,4 +1,4 @@
-/* $OpenBSD: perl.xs,v 1.3 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: perl.xs,v 1.4 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -15,10 +15,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)perl.xs 8.27 (Berkeley) 10/16/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/perl_api/perlsfio.c b/usr.bin/vi/perl_api/perlsfio.c
index 94abbd3814c..05a0ee9b4d4 100644
--- a/usr.bin/vi/perl_api/perlsfio.c
+++ b/usr.bin/vi/perl_api/perlsfio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: perlsfio.c,v 1.3 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: perlsfio.c,v 1.4 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1996
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)perlsfio.c 8.1 (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/vi/getc.c b/usr.bin/vi/vi/getc.c
index e82abd772d1..dc29213ae59 100644
--- a/usr.bin/vi/vi/getc.c
+++ b/usr.bin/vi/vi/getc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getc.c,v 1.7 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: getc.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[] = "@(#)getc.c 10.10 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_at.c b/usr.bin/vi/vi/v_at.c
index fc05017ac0a..233f9a73189 100644
--- a/usr.bin/vi/vi/v_at.c
+++ b/usr.bin/vi/vi/v_at.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_at.c,v 1.6 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_at.c,v 1.7 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[] = "@(#)v_at.c 10.8 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_ch.c b/usr.bin/vi/vi/v_ch.c
index 8329aa58e96..f9ca98a6fb6 100644
--- a/usr.bin/vi/vi/v_ch.c
+++ b/usr.bin/vi/vi/v_ch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_ch.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_ch.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[] = "@(#)v_ch.c 10.8 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_cmd.c b/usr.bin/vi/vi/v_cmd.c
index 7aff9988cde..ea141a732aa 100644
--- a/usr.bin/vi/vi/v_cmd.c
+++ b/usr.bin/vi/vi/v_cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_cmd.c,v 1.3 2004/11/29 21:51:08 jmc Exp $ */
+/* $OpenBSD: v_cmd.c,v 1.4 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[] = "@(#)v_cmd.c 10.9 (Berkeley) 3/28/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_delete.c b/usr.bin/vi/vi/v_delete.c
index b446d0f9bd6..c07eeb9e384 100644
--- a/usr.bin/vi/vi/v_delete.c
+++ b/usr.bin/vi/vi/v_delete.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_delete.c,v 1.6 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_delete.c,v 1.7 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[] = "@(#)v_delete.c 10.9 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_ex.c b/usr.bin/vi/vi/v_ex.c
index 5043d5c4c7b..fce8125b350 100644
--- a/usr.bin/vi/vi/v_ex.c
+++ b/usr.bin/vi/vi/v_ex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_ex.c,v 1.8 2006/03/20 01:00:36 pvalchev Exp $ */
+/* $OpenBSD: v_ex.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[] = "@(#)v_ex.c 10.42 (Berkeley) 6/28/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_increment.c b/usr.bin/vi/vi/v_increment.c
index f1848225422..95f5ed5a7b4 100644
--- a/usr.bin/vi/vi/v_increment.c
+++ b/usr.bin/vi/vi/v_increment.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_increment.c,v 1.6 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_increment.c,v 1.7 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[] = "@(#)v_increment.c 10.12 (Berkeley) 3/19/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_init.c b/usr.bin/vi/vi/v_init.c
index a212785bf91..6f201483ec2 100644
--- a/usr.bin/vi/vi/v_init.c
+++ b/usr.bin/vi/vi/v_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_init.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_init.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[] = "@(#)v_init.c 10.8 (Berkeley) 3/30/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_itxt.c b/usr.bin/vi/vi/v_itxt.c
index 40ac66673da..748f42da389 100644
--- a/usr.bin/vi/vi/v_itxt.c
+++ b/usr.bin/vi/vi/v_itxt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_itxt.c,v 1.6 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_itxt.c,v 1.7 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_itxt.c 10.16 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_left.c b/usr.bin/vi/vi/v_left.c
index 70ccb8b2df9..196d7d47388 100644
--- a/usr.bin/vi/vi/v_left.c
+++ b/usr.bin/vi/vi/v_left.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_left.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_left.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_left.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_mark.c b/usr.bin/vi/vi/v_mark.c
index f69c4e04e36..8fa292ca8e0 100644
--- a/usr.bin/vi/vi/v_mark.c
+++ b/usr.bin/vi/vi/v_mark.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_mark.c,v 1.7 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: v_mark.c,v 1.8 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_mark.c 10.8 (Berkeley) 9/20/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_match.c b/usr.bin/vi/vi/v_match.c
index 274c6636af9..b9eccd5f2a8 100644
--- a/usr.bin/vi/vi/v_match.c
+++ b/usr.bin/vi/vi/v_match.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_match.c,v 1.5 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_match.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_match.c 10.8 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_paragraph.c b/usr.bin/vi/vi/v_paragraph.c
index 157ea5eef49..56449327f59 100644
--- a/usr.bin/vi/vi/v_paragraph.c
+++ b/usr.bin/vi/vi/v_paragraph.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_paragraph.c,v 1.5 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_paragraph.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_paragraph.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_put.c b/usr.bin/vi/vi/v_put.c
index 8845852c371..e7a78c21ed2 100644
--- a/usr.bin/vi/vi/v_put.c
+++ b/usr.bin/vi/vi/v_put.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_put.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_put.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_put.c 10.5 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_redraw.c b/usr.bin/vi/vi/v_redraw.c
index 8c224722afd..eeea87d8c65 100644
--- a/usr.bin/vi/vi/v_redraw.c
+++ b/usr.bin/vi/vi/v_redraw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_redraw.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_redraw.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_redraw.c 10.6 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_replace.c b/usr.bin/vi/vi/v_replace.c
index 01910b2ccb4..47dcb292282 100644
--- a/usr.bin/vi/vi/v_replace.c
+++ b/usr.bin/vi/vi/v_replace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_replace.c,v 1.6 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_replace.c,v 1.7 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_replace.c 10.17 (Berkeley) 6/30/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_right.c b/usr.bin/vi/vi/v_right.c
index 0fbf2362fc0..9633a099d56 100644
--- a/usr.bin/vi/vi/v_right.c
+++ b/usr.bin/vi/vi/v_right.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_right.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_right.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_right.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_screen.c b/usr.bin/vi/vi/v_screen.c
index b28cb7d1f5c..015e99f158e 100644
--- a/usr.bin/vi/vi/v_screen.c
+++ b/usr.bin/vi/vi/v_screen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_screen.c,v 1.5 2005/10/17 19:12:16 otto Exp $ */
+/* $OpenBSD: v_screen.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_screen.c 10.10 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_scroll.c b/usr.bin/vi/vi/v_scroll.c
index 5ca270fbccd..baa49f286ff 100644
--- a/usr.bin/vi/vi/v_scroll.c
+++ b/usr.bin/vi/vi/v_scroll.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_scroll.c,v 1.7 2006/03/04 16:18:06 miod Exp $ */
+/* $OpenBSD: v_scroll.c,v 1.8 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_scroll.c 10.9 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_search.c b/usr.bin/vi/vi/v_search.c
index 8cb428f12dd..4c3599ae064 100644
--- a/usr.bin/vi/vi/v_search.c
+++ b/usr.bin/vi/vi/v_search.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_search.c,v 1.10 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: v_search.c,v 1.11 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_search.c 10.18 (Berkeley) 9/19/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_section.c b/usr.bin/vi/vi/v_section.c
index 6040bc1198d..503eff98c98 100644
--- a/usr.bin/vi/vi/v_section.c
+++ b/usr.bin/vi/vi/v_section.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_section.c,v 1.5 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_section.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_section.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_sentence.c b/usr.bin/vi/vi/v_sentence.c
index 54107f3fb03..caf02196331 100644
--- a/usr.bin/vi/vi/v_sentence.c
+++ b/usr.bin/vi/vi/v_sentence.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_sentence.c,v 1.5 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_sentence.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_sentence.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_status.c b/usr.bin/vi/vi/v_status.c
index d8e90393086..cba61738844 100644
--- a/usr.bin/vi/vi/v_status.c
+++ b/usr.bin/vi/vi/v_status.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_status.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_status.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_status.c 10.9 (Berkeley) 5/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/vi/v_txt.c b/usr.bin/vi/vi/v_txt.c
index 065996e14f9..d7c80ec8192 100644
--- a/usr.bin/vi/vi/v_txt.c
+++ b/usr.bin/vi/vi/v_txt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_txt.c,v 1.21 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: v_txt.c,v 1.22 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_txt.c 10.87 (Berkeley) 10/13/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/vi/v_ulcase.c b/usr.bin/vi/vi/v_ulcase.c
index 94735d87b43..653710d71f8 100644
--- a/usr.bin/vi/vi/v_ulcase.c
+++ b/usr.bin/vi/vi/v_ulcase.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_ulcase.c,v 1.6 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_ulcase.c,v 1.7 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_ulcase.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_undo.c b/usr.bin/vi/vi/v_undo.c
index ba9600e9154..dd90df19919 100644
--- a/usr.bin/vi/vi/v_undo.c
+++ b/usr.bin/vi/vi/v_undo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_undo.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_undo.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_undo.c 10.5 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_util.c b/usr.bin/vi/vi/v_util.c
index 39fd1217c2b..e31fbea8ae8 100644
--- a/usr.bin/vi/vi/v_util.c
+++ b/usr.bin/vi/vi/v_util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_util.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_util.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_util.c 10.11 (Berkeley) 6/30/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_word.c b/usr.bin/vi/vi/v_word.c
index 9cb613419b7..61ac531ea23 100644
--- a/usr.bin/vi/vi/v_word.c
+++ b/usr.bin/vi/vi/v_word.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_word.c,v 1.5 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_word.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_word.c 10.5 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_xchar.c b/usr.bin/vi/vi/v_xchar.c
index d3f43a384bc..48d501bd409 100644
--- a/usr.bin/vi/vi/v_xchar.c
+++ b/usr.bin/vi/vi/v_xchar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_xchar.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_xchar.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_xchar.c 10.9 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_yank.c b/usr.bin/vi/vi/v_yank.c
index 43ba898ffd4..9346981ebdf 100644
--- a/usr.bin/vi/vi/v_yank.c
+++ b/usr.bin/vi/vi/v_yank.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_yank.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_yank.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_yank.c 10.9 (Berkeley) 5/19/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_z.c b/usr.bin/vi/vi/v_z.c
index 58d85b2f8ae..406224e0827 100644
--- a/usr.bin/vi/vi/v_z.c
+++ b/usr.bin/vi/vi/v_z.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_z.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_z.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_z.c 10.10 (Berkeley) 5/16/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_zexit.c b/usr.bin/vi/vi/v_zexit.c
index 061017edf89..f33501f464b 100644
--- a/usr.bin/vi/vi/v_zexit.c
+++ b/usr.bin/vi/vi/v_zexit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_zexit.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_zexit.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_zexit.c 10.6 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vi.c b/usr.bin/vi/vi/vi.c
index 19357ff7168..8caf156bd80 100644
--- a/usr.bin/vi/vi/vi.c
+++ b/usr.bin/vi/vi/vi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vi.c,v 1.12 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: vi.c,v 1.13 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vi.c 10.57 (Berkeley) 10/13/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vs_line.c b/usr.bin/vi/vi/vs_line.c
index 827814bf777..8dda32926f9 100644
--- a/usr.bin/vi/vi/vs_line.c
+++ b/usr.bin/vi/vi/vs_line.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs_line.c,v 1.12 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: vs_line.c,v 1.13 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vs_line.c 10.19 (Berkeley) 9/26/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vs_msg.c b/usr.bin/vi/vi/vs_msg.c
index 9f526877557..6ffbbb393dc 100644
--- a/usr.bin/vi/vi/vs_msg.c
+++ b/usr.bin/vi/vi/vs_msg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs_msg.c,v 1.10 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: vs_msg.c,v 1.11 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vs_msg.c 10.77 (Berkeley) 10/13/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vs_refresh.c b/usr.bin/vi/vi/vs_refresh.c
index 55fa2428b61..1d377580b85 100644
--- a/usr.bin/vi/vi/vs_refresh.c
+++ b/usr.bin/vi/vi/vs_refresh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs_refresh.c,v 1.15 2008/03/08 18:11:42 otto Exp $ */
+/* $OpenBSD: vs_refresh.c,v 1.16 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vs_refresh.c 10.44 (Berkeley) 10/13/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vs_relative.c b/usr.bin/vi/vi/vs_relative.c
index ed99ebc2263..32a3568f506 100644
--- a/usr.bin/vi/vi/vs_relative.c
+++ b/usr.bin/vi/vi/vs_relative.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs_relative.c,v 1.7 2008/03/08 12:34:09 otto Exp $ */
+/* $OpenBSD: vs_relative.c,v 1.8 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vs_relative.c 10.11 (Berkeley) 5/13/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vs_smap.c b/usr.bin/vi/vi/vs_smap.c
index b81f3d27199..7135c702ec6 100644
--- a/usr.bin/vi/vi/vs_smap.c
+++ b/usr.bin/vi/vi/vs_smap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs_smap.c,v 1.6 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: vs_smap.c,v 1.7 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vs_smap.c 10.25 (Berkeley) 7/12/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vs_split.c b/usr.bin/vi/vi/vs_split.c
index daf761302e3..fb4074adc26 100644
--- a/usr.bin/vi/vi/vs_split.c
+++ b/usr.bin/vi/vi/vs_split.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs_split.c,v 1.9 2006/03/11 06:58:00 ray Exp $ */
+/* $OpenBSD: vs_split.c,v 1.10 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vs_split.c 10.31 (Berkeley) 10/13/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>