Bringing up to version 1.33

Reviewed by:	Sean Eric Fagan

33 files changed, 38 insertions, 35 deletions

diff --git a/usr.bin/vi/vi/getc.c b/usr.bin/vi/vi/getc.c
index 14c8423..dbdd6b2 100644
--- a/usr.bin/vi/vi/getc.c
+++ b/usr.bin/vi/vi/getc.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)getc.c	8.9 (Berkeley) 5/21/94";
+static const char sccsid[] = "@(#)getc.c	8.10 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_ch.c b/usr.bin/vi/vi/v_ch.c
index 1e59460..00b5b84 100644
--- a/usr.bin/vi/vi/v_ch.c
+++ b/usr.bin/vi/vi/v_ch.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_ch.c	8.13 (Berkeley) 7/27/94";
+static const char sccsid[] = "@(#)v_ch.c	8.14 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_delete.c b/usr.bin/vi/vi/v_delete.c
index aa2af98..73996c3 100644
--- a/usr.bin/vi/vi/v_delete.c
+++ b/usr.bin/vi/vi/v_delete.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_delete.c	8.14 (Berkeley) 7/28/94";
+static const char sccsid[] = "@(#)v_delete.c	8.15 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_ex.c b/usr.bin/vi/vi/v_ex.c
index 6481b407..466cd2f 100644
--- a/usr.bin/vi/vi/v_ex.c
+++ b/usr.bin/vi/vi/v_ex.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_ex.c	8.10 (Berkeley) 8/4/94";
+static const char sccsid[] = "@(#)v_ex.c	8.11 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_increment.c b/usr.bin/vi/vi/v_increment.c
index 6961953..48f31dc 100644
--- a/usr.bin/vi/vi/v_increment.c
+++ b/usr.bin/vi/vi/v_increment.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_increment.c	8.9 (Berkeley) 5/21/94";
+static const char sccsid[] = "@(#)v_increment.c	8.10 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_init.c b/usr.bin/vi/vi/v_init.c
index 069733c..a7b8ad3 100644
--- a/usr.bin/vi/vi/v_init.c
+++ b/usr.bin/vi/vi/v_init.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_init.c	8.26 (Berkeley) 8/8/94";
+static const char sccsid[] = "@(#)v_init.c	8.27 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_left.c b/usr.bin/vi/vi/v_left.c
index ec57d91..2578782 100644
--- a/usr.bin/vi/vi/v_left.c
+++ b/usr.bin/vi/vi/v_left.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_left.c	8.9 (Berkeley) 7/27/94";
+static const char sccsid[] = "@(#)v_left.c	8.10 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_mark.c b/usr.bin/vi/vi/v_mark.c
index 66dda1a..640ef8f 100644
--- a/usr.bin/vi/vi/v_mark.c
+++ b/usr.bin/vi/vi/v_mark.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_mark.c	8.8 (Berkeley) 7/27/94";
+static const char sccsid[] = "@(#)v_mark.c	8.9 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_match.c b/usr.bin/vi/vi/v_match.c
index b047a44..ee1529f 100644
--- a/usr.bin/vi/vi/v_match.c
+++ b/usr.bin/vi/vi/v_match.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_match.c	8.14 (Berkeley) 7/27/94";
+static const char sccsid[] = "@(#)v_match.c	8.15 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_ntext.c b/usr.bin/vi/vi/v_ntext.c
index 5dcba3b..4d242f9 100644
--- a/usr.bin/vi/vi/v_ntext.c
+++ b/usr.bin/vi/vi/v_ntext.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_ntext.c	8.120 (Berkeley) 8/15/94";
+static const char sccsid[] = "@(#)v_ntext.c	8.121 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_paragraph.c b/usr.bin/vi/vi/v_paragraph.c
index 590718d..6565cdf 100644
--- a/usr.bin/vi/vi/v_paragraph.c
+++ b/usr.bin/vi/vi/v_paragraph.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_paragraph.c	8.18 (Berkeley) 7/29/94";
+static const char sccsid[] = "@(#)v_paragraph.c	8.19 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_put.c b/usr.bin/vi/vi/v_put.c
index 8206d16..9065306 100644
--- a/usr.bin/vi/vi/v_put.c
+++ b/usr.bin/vi/vi/v_put.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_put.c	8.9 (Berkeley) 5/2/94";
+static const char sccsid[] = "@(#)v_put.c	8.10 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_redraw.c b/usr.bin/vi/vi/v_redraw.c
index 8f7054c..393c017 100644
--- a/usr.bin/vi/vi/v_redraw.c
+++ b/usr.bin/vi/vi/v_redraw.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_redraw.c	8.4 (Berkeley) 3/8/94";
+static const char sccsid[] = "@(#)v_redraw.c	8.5 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_replace.c b/usr.bin/vi/vi/v_replace.c
index 9254024..5daf174 100644
--- a/usr.bin/vi/vi/v_replace.c
+++ b/usr.bin/vi/vi/v_replace.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_replace.c	8.18 (Berkeley) 5/21/94";
+static const char sccsid[] = "@(#)v_replace.c	8.19 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_right.c b/usr.bin/vi/vi/v_right.c
index df7c85c..142ed7f 100644
--- a/usr.bin/vi/vi/v_right.c
+++ b/usr.bin/vi/vi/v_right.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_right.c	8.8 (Berkeley) 7/27/94";
+static const char sccsid[] = "@(#)v_right.c	8.9 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_screen.c b/usr.bin/vi/vi/v_screen.c
index 20ca6ba..18212cf 100644
--- a/usr.bin/vi/vi/v_screen.c
+++ b/usr.bin/vi/vi/v_screen.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_screen.c	8.12 (Berkeley) 8/8/94";
+static const char sccsid[] = "@(#)v_screen.c	8.13 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_scroll.c b/usr.bin/vi/vi/v_scroll.c
index b381dc5..631b06e 100644
--- a/usr.bin/vi/vi/v_scroll.c
+++ b/usr.bin/vi/vi/v_scroll.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_scroll.c	8.20 (Berkeley) 7/27/94";
+static const char sccsid[] = "@(#)v_scroll.c	8.21 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_search.c b/usr.bin/vi/vi/v_search.c
index 2ba013a..8a30cbe 100644
--- a/usr.bin/vi/vi/v_search.c
+++ b/usr.bin/vi/vi/v_search.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_search.c	8.32 (Berkeley) 7/27/94";
+static const char sccsid[] = "@(#)v_search.c	8.33 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_section.c b/usr.bin/vi/vi/v_section.c
index 9bc06b6..098da18 100644
--- a/usr.bin/vi/vi/v_section.c
+++ b/usr.bin/vi/vi/v_section.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_section.c	8.10 (Berkeley) 7/27/94";
+static const char sccsid[] = "@(#)v_section.c	8.11 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_sentence.c b/usr.bin/vi/vi/v_sentence.c
index 87c6039..73175f9 100644
--- a/usr.bin/vi/vi/v_sentence.c
+++ b/usr.bin/vi/vi/v_sentence.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_sentence.c	8.15 (Berkeley) 7/27/94";
+static const char sccsid[] = "@(#)v_sentence.c	8.16 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_status.c b/usr.bin/vi/vi/v_status.c
index 5ea544c..7d5db71 100644
--- a/usr.bin/vi/vi/v_status.c
+++ b/usr.bin/vi/vi/v_status.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_status.c	8.16 (Berkeley) 8/14/94";
+static const char sccsid[] = "@(#)v_status.c	8.17 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/vi/vi/v_stop.c b/usr.bin/vi/vi/v_stop.c
index 1e865d9..e001520 100644
--- a/usr.bin/vi/vi/v_stop.c
+++ b/usr.bin/vi/vi/v_stop.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_stop.c	8.7 (Berkeley) 3/8/94";
+static const char sccsid[] = "@(#)v_stop.c	8.8 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_text.c b/usr.bin/vi/vi/v_text.c
index e6c940a..85aca5a 100644
--- a/usr.bin/vi/vi/v_text.c
+++ b/usr.bin/vi/vi/v_text.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_text.c	8.40 (Berkeley) 8/14/94";
+static const char sccsid[] = "@(#)v_text.c	8.42 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -614,10 +614,13 @@ v_change(sp, ep, vp)
 	LOG_CORRECT;
 
 	/*
-	 * Turn off the VM_RCM flags, inserting text has its own rules for
-	 * cursor positioning.
+	 * 'c' can be combined with motion commands that set the resulting
+	 * cursor position, i.e. "cG".  Clear the VM_RCM flags and make the
+	 * resulting cursor position stick, inserting text has its own rules
+	 * for cursor positioning.
 	 */
 	F_CLR(vp, VM_RCM_MASK);
+	F_SET(vp, VM_RCM_SET);
 
 	/*
 	 * If not in line mode and changing within a single line, the line
diff --git a/usr.bin/vi/vi/v_ulcase.c b/usr.bin/vi/vi/v_ulcase.c
index 9bf150f..12a6d74 100644
--- a/usr.bin/vi/vi/v_ulcase.c
+++ b/usr.bin/vi/vi/v_ulcase.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_ulcase.c	8.8 (Berkeley) 7/15/94";
+static const char sccsid[] = "@(#)v_ulcase.c	8.9 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_undo.c b/usr.bin/vi/vi/v_undo.c
index 65dc715..38ab7eb0 100644
--- a/usr.bin/vi/vi/v_undo.c
+++ b/usr.bin/vi/vi/v_undo.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_undo.c	8.10 (Berkeley) 5/7/94";
+static const char sccsid[] = "@(#)v_undo.c	8.11 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_util.c b/usr.bin/vi/vi/v_util.c
index d7defa8..dcbf576 100644
--- a/usr.bin/vi/vi/v_util.c
+++ b/usr.bin/vi/vi/v_util.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_util.c	8.10 (Berkeley) 7/18/94";
+static const char sccsid[] = "@(#)v_util.c	8.11 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_word.c b/usr.bin/vi/vi/v_word.c
index 7c53fe9..42b1918 100644
--- a/usr.bin/vi/vi/v_word.c
+++ b/usr.bin/vi/vi/v_word.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_word.c	8.21 (Berkeley) 7/27/94";
+static const char sccsid[] = "@(#)v_word.c	8.22 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_xchar.c b/usr.bin/vi/vi/v_xchar.c
index 6bb317c..681742b 100644
--- a/usr.bin/vi/vi/v_xchar.c
+++ b/usr.bin/vi/vi/v_xchar.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_xchar.c	8.8 (Berkeley) 5/21/94";
+static const char sccsid[] = "@(#)v_xchar.c	8.9 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_yank.c b/usr.bin/vi/vi/v_yank.c
index 14f99f5..28ae9a2 100644
--- a/usr.bin/vi/vi/v_yank.c
+++ b/usr.bin/vi/vi/v_yank.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_yank.c	8.14 (Berkeley) 5/17/94";
+static const char sccsid[] = "@(#)v_yank.c	8.15 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_z.c b/usr.bin/vi/vi/v_z.c
index ca780f4..27ae121 100644
--- a/usr.bin/vi/vi/v_z.c
+++ b/usr.bin/vi/vi/v_z.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_z.c	8.16 (Berkeley) 7/17/94";
+static const char sccsid[] = "@(#)v_z.c	8.17 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/v_zexit.c b/usr.bin/vi/vi/v_zexit.c
index cd4aac7..6e5b332 100644
--- a/usr.bin/vi/vi/v_zexit.c
+++ b/usr.bin/vi/vi/v_zexit.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)v_zexit.c	8.11 (Berkeley) 8/4/94";
+static const char sccsid[] = "@(#)v_zexit.c	8.12 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/vcmd.c b/usr.bin/vi/vi/vcmd.c
index 59b6e8b..aa284bf 100644
--- a/usr.bin/vi/vi/vcmd.c
+++ b/usr.bin/vi/vi/vcmd.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)vcmd.c	8.39 (Berkeley) 7/28/94";
+static const char sccsid[] = "@(#)vcmd.c	8.40 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/vi/vi.c b/usr.bin/vi/vi/vi.c
index 9e52eb1..66f1909 100644
--- a/usr.bin/vi/vi/vi.c
+++ b/usr.bin/vi/vi/vi.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)vi.c	8.89 (Berkeley) 8/14/94";
+static const char sccsid[] = "@(#)vi.c	8.90 (Berkeley) 8/17/94";
 #endif /* not lint */
 
 #include <sys/types.h>