From 2d737de55ea91e4369cede1975bc099cd81a565f Mon Sep 17 00:00:00 2001 From: sef Date: Wed, 17 Aug 1994 22:18:03 +0000 Subject: [PATCH] Bringing up to version 1.33 Reviewed by: Sean Eric Fagan --- usr.bin/vi/vi/getc.c | 2 +- usr.bin/vi/vi/v_ch.c | 2 +- usr.bin/vi/vi/v_delete.c | 2 +- usr.bin/vi/vi/v_ex.c | 2 +- usr.bin/vi/vi/v_increment.c | 2 +- usr.bin/vi/vi/v_init.c | 2 +- usr.bin/vi/vi/v_left.c | 2 +- usr.bin/vi/vi/v_mark.c | 2 +- usr.bin/vi/vi/v_match.c | 2 +- usr.bin/vi/vi/v_ntext.c | 2 +- usr.bin/vi/vi/v_paragraph.c | 2 +- usr.bin/vi/vi/v_put.c | 2 +- usr.bin/vi/vi/v_redraw.c | 2 +- usr.bin/vi/vi/v_replace.c | 2 +- usr.bin/vi/vi/v_right.c | 2 +- usr.bin/vi/vi/v_screen.c | 2 +- usr.bin/vi/vi/v_scroll.c | 2 +- usr.bin/vi/vi/v_search.c | 2 +- usr.bin/vi/vi/v_section.c | 2 +- usr.bin/vi/vi/v_sentence.c | 2 +- usr.bin/vi/vi/v_status.c | 2 +- usr.bin/vi/vi/v_stop.c | 2 +- usr.bin/vi/vi/v_text.c | 9 ++++++--- usr.bin/vi/vi/v_ulcase.c | 2 +- usr.bin/vi/vi/v_undo.c | 2 +- usr.bin/vi/vi/v_util.c | 2 +- usr.bin/vi/vi/v_word.c | 2 +- usr.bin/vi/vi/v_xchar.c | 2 +- usr.bin/vi/vi/v_yank.c | 2 +- usr.bin/vi/vi/v_z.c | 2 +- usr.bin/vi/vi/v_zexit.c | 2 +- usr.bin/vi/vi/vcmd.c | 2 +- usr.bin/vi/vi/vi.c | 2 +- 33 files changed, 38 insertions(+), 35 deletions(-) diff --git a/usr.bin/vi/vi/getc.c b/usr.bin/vi/vi/getc.c index 14c8423120c0..dbdd6b23eaf1 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 diff --git a/usr.bin/vi/vi/v_ch.c b/usr.bin/vi/vi/v_ch.c index 1e59460ff7d9..00b5b8420f6d 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 diff --git a/usr.bin/vi/vi/v_delete.c b/usr.bin/vi/vi/v_delete.c index aa2af9814e95..73996c393e83 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 diff --git a/usr.bin/vi/vi/v_ex.c b/usr.bin/vi/vi/v_ex.c index 6481b407d002..466cd2f946c1 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 diff --git a/usr.bin/vi/vi/v_increment.c b/usr.bin/vi/vi/v_increment.c index 6961953276dc..48f31dc27cbc 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 diff --git a/usr.bin/vi/vi/v_init.c b/usr.bin/vi/vi/v_init.c index 069733ce1b23..a7b8ad381151 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 diff --git a/usr.bin/vi/vi/v_left.c b/usr.bin/vi/vi/v_left.c index ec57d9143091..2578782557c2 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 diff --git a/usr.bin/vi/vi/v_mark.c b/usr.bin/vi/vi/v_mark.c index 66dda1a7ff59..640ef8f8667b 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 diff --git a/usr.bin/vi/vi/v_match.c b/usr.bin/vi/vi/v_match.c index b047a4431747..ee1529fa0390 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 diff --git a/usr.bin/vi/vi/v_ntext.c b/usr.bin/vi/vi/v_ntext.c index 5dcba3b2f967..4d242f9ccf27 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 diff --git a/usr.bin/vi/vi/v_paragraph.c b/usr.bin/vi/vi/v_paragraph.c index 590718dd7fdb..6565cdfb5e9a 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 diff --git a/usr.bin/vi/vi/v_put.c b/usr.bin/vi/vi/v_put.c index 8206d1621d35..90653068292a 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 diff --git a/usr.bin/vi/vi/v_redraw.c b/usr.bin/vi/vi/v_redraw.c index 8f7054ca9522..393c01711ea7 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 diff --git a/usr.bin/vi/vi/v_replace.c b/usr.bin/vi/vi/v_replace.c index 92540242bd51..5daf17497b12 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 diff --git a/usr.bin/vi/vi/v_right.c b/usr.bin/vi/vi/v_right.c index df7c85ca9fc8..142ed7f6b499 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 diff --git a/usr.bin/vi/vi/v_screen.c b/usr.bin/vi/vi/v_screen.c index 20ca6ba67a30..18212cf6bb58 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 diff --git a/usr.bin/vi/vi/v_scroll.c b/usr.bin/vi/vi/v_scroll.c index b381dc550517..631b06e8b726 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 diff --git a/usr.bin/vi/vi/v_search.c b/usr.bin/vi/vi/v_search.c index 2ba013ae91f2..8a30cbe6e0b6 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 diff --git a/usr.bin/vi/vi/v_section.c b/usr.bin/vi/vi/v_section.c index 9bc06b678995..098da18bdbdd 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 diff --git a/usr.bin/vi/vi/v_sentence.c b/usr.bin/vi/vi/v_sentence.c index 87c6039ac3f5..73175f95f15d 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 diff --git a/usr.bin/vi/vi/v_status.c b/usr.bin/vi/vi/v_status.c index 5ea544c7e2a8..7d5db718d127 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 diff --git a/usr.bin/vi/vi/v_stop.c b/usr.bin/vi/vi/v_stop.c index 1e865d97da4d..e00152094efe 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 diff --git a/usr.bin/vi/vi/v_text.c b/usr.bin/vi/vi/v_text.c index e6c940a7bf93..85aca5a6a867 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 @@ -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 9bf150fd3cbd..12a6d74ab1ca 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 diff --git a/usr.bin/vi/vi/v_undo.c b/usr.bin/vi/vi/v_undo.c index 65dc715e189a..38ab7eb005a1 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 diff --git a/usr.bin/vi/vi/v_util.c b/usr.bin/vi/vi/v_util.c index d7defa8c3db4..dcbf576cbed4 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 diff --git a/usr.bin/vi/vi/v_word.c b/usr.bin/vi/vi/v_word.c index 7c53fe98fd67..42b191865eb1 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 diff --git a/usr.bin/vi/vi/v_xchar.c b/usr.bin/vi/vi/v_xchar.c index 6bb317cd5f73..681742b1c85b 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 diff --git a/usr.bin/vi/vi/v_yank.c b/usr.bin/vi/vi/v_yank.c index 14f99f57ce47..28ae9a2cee27 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 diff --git a/usr.bin/vi/vi/v_z.c b/usr.bin/vi/vi/v_z.c index ca780f400055..27ae121f4fce 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 diff --git a/usr.bin/vi/vi/v_zexit.c b/usr.bin/vi/vi/v_zexit.c index cd4aac715a35..6e5b332f6d05 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 diff --git a/usr.bin/vi/vi/vcmd.c b/usr.bin/vi/vi/vcmd.c index 59b6e8b34482..aa284bfd56a4 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 diff --git a/usr.bin/vi/vi/vi.c b/usr.bin/vi/vi/vi.c index 9e52eb1c8884..66f19092e57d 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