# vile 9.4f - patch 2004/4/11 - T.Dickey <dickey@invisible-island.net>
# ------------------------------------------------------------------------------
# CHANGES             |   49 ++
# MANIFEST            |    2 
# csrch.c             |  251 ++++++------
# doc/macros.doc      |   20 -
# doc/modes.doc       |   12 
# eval.c              |   15 
# exec.c              |   17 
# filters/filters.rc  |  153 ++++---
# filters/makefile.in |    3 
# filters/makelist.sh |    4 
# filters/pas-filt.l  |    3 
# globals.c           |  193 ++++-----
# main.c              |    4 
# makefile.in         |    5 
# map.c               |  988 ++++++++++++++++++++++++--------------------------
# modes.c             |   93 +++-
# modetbl             |   10 
# ntwinio.c           |    4 
# oneliner.c          |    5 
# patchlev.h          |    2 
# perl.xs             |    9 
# revlist             |   50 +-
# vile-9.4.spec       |   14 
# vile.hlp            |  399 +++++++++++++++-----
# wordmov.c           |  628 +++++++++++++++++--------------
# 25 files changed, 1671 insertions(+), 1262 deletions(-)
# ------------------------------------------------------------------------------
Index: CHANGES
--- vile-9.4e+/CHANGES	2004-03-21 18:30:55.000000000 -0500
+++ vile-9.4f/CHANGES	2004-04-11 20:13:30.000000000 -0400
@@ -1,5 +1,54 @@
 Changes for vile 9.5 (released ??? ??? ?? ????)
 
+ 20040411 (f)
+	> Clark Morgan:
+	+ modify vilemode, adding "sections" expression.
+	+ vile.hlp changes:
+	  + modify syntax coloring topic to remove prerequisites that refer to
+	    features from long, long ago ("nocmode" and old copies of c syntax
+	    coloring files) that most users won't remember or encounter.
+	  + revamped "Editor modes" section, in particular, moving discussion
+	    of majormodes to a point in the help file that directly follows
+	    syntax coloring.
+	  + added mode flavor tags (B, U, W, M) to modes that lacked same.
+	  + documented that "suffixes" is tested against a filename's complete
+	    path.
+	  + stripped c-tabstop from vile startup example.
+	  + explicitly emphasized ignoresuffix's behavior.
+	  + for cindent, tabstop and shiftwidth modes, documented cmode's
+	    default local mode values.
+	  + added a "Majormodes" section. Added a subsection entitled
+	    "cmode: the original vile builtin majormode"
+ 	> Tom Dickey:
+	+ indent'd csrch.c, globals.c, map.c, wordmov.c
+	+ modify logic for RS_AUTO to treat it consistently as the "default"
+	  keyword for record separator (report by Clark Morgan).
+	+ remove an unnecessary message from makelist.sh (report by Clark
+	  Morgan).
+	+ modify mac_tokval() to avoid calling tb_scopy() if the result from
+	  tokval() is the original pointer plus one (for stripping a leading
+	  quote), fixes an overlapping memcpy warning from valgrind.
+	+ correct logic in test_by_suffix(), which was not obtaining the
+	  submode value for "ignoresuffix" as intended (discussion with Clark
+	  Morgan).
+	+ modify comparison for maplength to use at least 25.  Very small
+	  values make vile unusable (report by Clark Morgan).
+	+ revert part of the initialization in substreg1() so the replacement
+	  pattern is reset rather than copied (report by Brendan O'Dea, 9.3n).
+	+ make "TODO" a txtmode file.
+	+ add ".shar" to shmode suffixes.
+	+ add "&match" and "&cmatch" functions for checking if a given regular
+	  expression matches a string (request by Clark Morgan).
+	+ split up the majormode "suffixes" into suffixes, mode-filename and
+	  mode-pathname to make it clearer how to associated regular
+	  expressions with the filename for majormodes (discussion with Clark
+	  Morgan).
+	+ remove explicit assignment to DESTDIR in makefile.in's, since newer
+	  GNU make program does not allow command-line to override it (it
+	  apparently did work with some version of GNU make in 1999 for 8.3i).
+	+ correct logic in perl.xs from 9.4d which parses $VILE_LIBDIR_PATH;
+	  it used the wrong variable for storing an intermediate result.
+
  20040321 (e)
 	> Clark Morgan:
 	+ document set-highlighting macro in vile.hlp
Index: MANIFEST
--- vile-9.4e+/MANIFEST	2004-03-21 20:42:42.000000000 -0500
+++ vile-9.4f/MANIFEST	2004-04-11 20:45:53.000000000 -0400
@@ -1,4 +1,4 @@
-MANIFEST for vile, version v9_4e
+MANIFEST for vile, version v9_4f
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 CHANGES                         Change-log for VILE
Index: csrch.c
Prereq:  1.31 
--- vile-9.4e+/csrch.c	2002-08-27 18:40:15.000000000 -0400
+++ vile-9.4f/csrch.c	2004-04-11 19:23:13.000000000 -0400
@@ -2,7 +2,7 @@
  * These functions perform vi's on-this-line character scanning functions.
  * written for vile: Copyright (c) 1990, 1995-2002 by Paul Fox
  *
- * $Header: /usr/build/vile/vile/RCS/csrch.c,v 1.31 2002/08/27 22:40:15 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/csrch.c,v 1.32 2004/04/11 23:23:13 tom Exp $
  *
 */
 
@@ -10,194 +10,197 @@
 #include "edef.h"
 
 static USHORT lstscan;
-static int   lstchar;
-#define BACK 0
-#define FORW 1
-#define DIREC 1
-
-#define F 0
-#define T 2
-#define TYPE 2
+static int lstchar;
+
+#define BACK	0
+#define FORW	1
+#define DIREC	1
+
+#define F	0
+#define T	2
+#define TYPE	2
 
 static int
 fscan(int f, int n, int c)
 {
-	int i;
-	int doto;
+    int i;
+    int doto;
 
-	if (!f || n <= 0)
-		n = 1;
+    if (!f || n <= 0)
+	n = 1;
 
-	lstchar = c;
-	lstscan = FORW;
+    lstchar = c;
+    lstscan = FORW;
 
-	doto = DOT.o;
-
-	i = doto+1;
-	while(i < llength(DOT.l)) {
-		if ( c == lgetc(DOT.l,i)) {
-			doto = i;
-			n--;
-			if (!n) break;
-		}
-		i++;
-	}
-
-	if ( i >= llength(DOT.l)) {
-		return(FALSE);
-	}
-	if (doingopcmd && !doingsweep)
-		doto++;
-	else if (doingsweep)
-		sweephack = TRUE;
-
-	DOT.o = doto;
-	curwp->w_flag |= WFMOVE;
-	return(TRUE);
+    doto = DOT.o;
+
+    i = doto + 1;
+    while (i < llength(DOT.l)) {
+	if (c == lgetc(DOT.l, i)) {
+	    doto = i;
+	    n--;
+	    if (!n)
+		break;
+	}
+	i++;
+    }
+
+    if (i >= llength(DOT.l)) {
+	return (FALSE);
+    }
+    if (doingopcmd && !doingsweep)
+	doto++;
+    else if (doingsweep)
+	sweephack = TRUE;
+
+    DOT.o = doto;
+    curwp->w_flag |= WFMOVE;
+    return (TRUE);
 
 }
 
 static int
 bscan(int f, int n, int c)
 {
-	int i;
-	int doto;
+    int i;
+    int doto;
 
-	if (!f || n <= 0)
-		n = 1;
+    if (!f || n <= 0)
+	n = 1;
 
-	lstchar = c;
-	lstscan = BACK;
+    lstchar = c;
+    lstscan = BACK;
 
-	doto = DOT.o;
-
-	i = doto-1;
-	while(i >= w_left_margin(curwp)) {
-		if ( c == lgetc(DOT.l,i)) {
-			doto = i;
-			n--;
-			if (!n) break;
-		}
-		i--;
-	}
-
-	if ( i < w_left_margin(curwp) ) {
-		return(FALSE);
-	}
-
-	DOT.o = doto;
-	curwp->w_flag |= WFMOVE;
-	return(TRUE);
+    doto = DOT.o;
+
+    i = doto - 1;
+    while (i >= w_left_margin(curwp)) {
+	if (c == lgetc(DOT.l, i)) {
+	    doto = i;
+	    n--;
+	    if (!n)
+		break;
+	}
+	i--;
+    }
+
+    if (i < w_left_margin(curwp)) {
+	return (FALSE);
+    }
+
+    DOT.o = doto;
+    curwp->w_flag |= WFMOVE;
+    return (TRUE);
 
 }
 
 static int
 get_csrch_char(int *cp)
 {
-	int c;
+    int c;
 
-	if (clexec || isnamedcmd) {
-		int status;
-		static char cbuf[2];
-		if ((status=mlreply("Scan for: ", cbuf, 2)) != TRUE)
-			return status;
-		c = cbuf[0];
-	} else {
-		c = keystroke();
-		if (c == quotec)
-			c = keystroke_raw8();
-		else if (ABORTED(c))
-			return FALSE;
-	}
+    if (clexec || isnamedcmd) {
+	int status;
+	static char cbuf[2];
+	if ((status = mlreply("Scan for: ", cbuf, 2)) != TRUE)
+	    return status;
+	c = cbuf[0];
+    } else {
+	c = keystroke();
+	if (c == quotec)
+	    c = keystroke_raw8();
+	else if (ABORTED(c))
+	    return FALSE;
+    }
 
-	*cp = c;
-	return TRUE;
+    *cp = c;
+    return TRUE;
 }
 
 /* f */
 int
 fcsrch(int f, int n)
 {
-	int c, s;
+    int c, s;
 
-	s = get_csrch_char(&c);
-	if (s != TRUE)
-		return s;
+    s = get_csrch_char(&c);
+    if (s != TRUE)
+	return s;
 
-	return(fscan(f,n,c));
+    return (fscan(f, n, c));
 }
 
 /* F */
 int
 bcsrch(int f, int n)
 {
-	int c, s;
+    int c, s;
 
-	s = get_csrch_char(&c);
-	if (s != TRUE)
-		return s;
+    s = get_csrch_char(&c);
+    if (s != TRUE)
+	return s;
 
-	return(bscan(f,n,c));
+    return (bscan(f, n, c));
 }
 
 /* t */
 int
 fcsrch_to(int f, int n)
 {
-	int s;
-	s = fcsrch(f,n);
-	if (s == TRUE)
-		s = backchar(FALSE,1);
-	lstscan |= T;
-	return(s);
+    int s;
+    s = fcsrch(f, n);
+    if (s == TRUE)
+	s = backchar(FALSE, 1);
+    lstscan |= T;
+    return (s);
 }
 
 /* T */
 int
 bcsrch_to(int f, int n)
 {
-	int s;
-	s = bcsrch(f,n);
-	if (s == TRUE)
-		s = forwchar(FALSE,1);
-	lstscan |= T;
-	return(s);
+    int s;
+    s = bcsrch(f, n);
+    if (s == TRUE)
+	s = forwchar(FALSE, 1);
+    lstscan |= T;
+    return (s);
 }
 
 /* ; */
 int
 rep_csrch(int f, int n)
 {
-	int s;
-	USHORT ls = lstscan;
+    int s;
+    USHORT ls = lstscan;
 
-	if ((ls & DIREC) == FORW) {
-		s = fscan(f,n,lstchar);
-		if ((ls & TYPE) == T) {
-			if (s == TRUE)
-				s = backchar(FALSE,1);
-			lstscan |= T;
-		}
-		return(s);
-	} else {
-		s = bscan(f,n,lstchar);
-		if ((ls & TYPE) == T) {
-			if (s == TRUE)
-				s = forwchar(FALSE,1);
-			lstscan |= T;
-		}
-		return(s);
+    if ((ls & DIREC) == FORW) {
+	s = fscan(f, n, lstchar);
+	if ((ls & TYPE) == T) {
+	    if (s == TRUE)
+		s = backchar(FALSE, 1);
+	    lstscan |= T;
+	}
+	return (s);
+    } else {
+	s = bscan(f, n, lstchar);
+	if ((ls & TYPE) == T) {
+	    if (s == TRUE)
+		s = forwchar(FALSE, 1);
+	    lstscan |= T;
 	}
+	return (s);
+    }
 }
 
 /* , */
 int
 rev_csrch(int f, int n)
 {
-	int s;
+    int s;
 
-	lstscan ^= DIREC;
-	s = rep_csrch(f,n);
-	lstscan ^= DIREC;
-	return(s);
+    lstscan ^= DIREC;
+    s = rep_csrch(f, n);
+    lstscan ^= DIREC;
+    return (s);
 }
Index: doc/macros.doc
Prereq:  1.89 
--- vile-9.4e+/doc/macros.doc	2003-05-05 17:56:12.000000000 -0400
+++ vile-9.4f/doc/macros.doc	2004-04-11 13:20:38.000000000 -0400
@@ -830,14 +830,20 @@
 	    &writable "S"	    Is the named file "S" writable?
 	    &execable "S"	    Is the named file "S" exec'able?
 
-	    &filter "M"             Does the given majormode have a built-in
-				    highlighting filter?
+	    &cmatch "R" "V"	    Does the given regular expression "R"
+				    match the value "V" (ignoring case)?
+
+	    &error "S"		    Was the string set with the ERROR token?
+				    For example, a &query that is aborted
+				    will return an ERROR result.
 
-	    &error "S"              Was the string set with the ERROR token?
-					For example, a &query that is aborted
-					will return an ERROR result.
+	    &match "R" "V"	    Does the given regular expression "R"
+				    match the value "V"?
+
+	    &filter "M"		    Does the given majormode have a built-in
+				    highlighting filter?
 
-	    &stoken "T" "D" "S"     Is token "T" in string "S", given
+	    &stoken "T" "D" "S"	    Is token "T" in string "S", given
 				    delimiters "D"?
 
 
@@ -1450,6 +1456,6 @@
 	========================= end vile.rc =======================
 
 -----------------------------------
-  $Header: /usr/build/vile/vile/doc/RCS/macros.doc,v 1.89 2003/05/05 21:56:12 tom Exp $
+  $Header: /usr/build/vile/vile/doc/RCS/macros.doc,v 1.91 2004/04/11 17:20:38 tom Exp $
 -----------------------------------
 
Index: doc/modes.doc
Prereq:  1.13 
--- vile-9.4e+/doc/modes.doc	2004-03-18 15:47:56.000000000 -0500
+++ vile-9.4f/doc/modes.doc	2004-04-11 19:30:15.000000000 -0400
@@ -41,7 +41,7 @@
 
 	  The search is in normally alphabetic order, by majormode name.
 	  The first match each, of suffixes and preamble terminate the
-	  search, but a match of preamble overrides a match of suffixes.
+	  search, but a match of suffixes overrides a match of preamble.
 	  Use "after" and "before" qualifiers to handle special cases.
 
 	  In rare circumstances, both suffixes and preamble are needed to
@@ -216,6 +216,14 @@
 The following are keywords that aren't minor modes, but are recognized
 solely by the define-submode command:
 
+	mode-pathname
+		The full pathname which is tested to trigger association with a
+		majormode, e.g., "RCS/*,v".
+
+	mode-filename
+		The filename which is tested to trigger association with a
+		majormode, e.g., "Makefile".
+
 	suffixes
 		The filename suffix which is tested to trigger
 		association with a majormode (e.g., c-suffixes)
@@ -360,5 +368,5 @@
 	define-submode c tabstop=8
 
 -------------------------------
-$Header: /usr/build/vile/vile/doc/RCS/modes.doc,v 1.13 2004/03/18 20:47:56 tom Exp $
+$Header: /usr/build/vile/vile/doc/RCS/modes.doc,v 1.16 2004/04/11 23:30:15 tom Exp $
 -------------------------------
Index: eval.c
Prereq:  1.322 
--- vile-9.4e+/eval.c	2003-05-25 19:34:52.000000000 -0400
+++ vile-9.4f/eval.c	2004-04-11 13:18:48.000000000 -0400
@@ -2,7 +2,7 @@
  *	eval.c -- function and variable evaluation
  *	original by Daniel Lawrence
  *
- * $Header: /usr/build/vile/vile/RCS/eval.c,v 1.322 2003/05/25 23:34:52 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/eval.c,v 1.324 2004/04/11 17:18:48 tom Exp $
  *
  */
 
@@ -741,6 +741,7 @@
 {
     static TBUFF *result;	/* function result */
 
+    REGEXVAL *exp;
     BUFFER *bp;
     TBUFF *args[MAXARGS];
     char *arg[MAXARGS];		/* function arguments */
@@ -923,6 +924,18 @@
 	(void) kcod2escape_seq(kbd_seq_nomap(), tb_values(result));
 	result->tb_used = strlen(tb_values(result));
 	break;
+    case UFCMATCH:
+	if ((exp = new_regexval(arg[0], TRUE)) != 0) {
+	    int save_flag = ignorecase;
+	    ignorecase = TRUE;
+	    value = regexec(exp->reg, arg[1], (char *) 0, 0, -1);
+	    ignorecase = save_flag;
+	}
+	break;
+    case UFMATCH:
+	if ((exp = new_regexval(arg[0], TRUE)) != 0)
+	    value = regexec(exp->reg, arg[1], (char *) 0, 0, -1);
+	break;
     case UFRANDOM:		/* FALLTHRU */
     case UFRND:
 	if (!is_error)
Index: exec.c
Prereq:  1.260 
--- vile-9.4e+/exec.c	2004-03-21 12:25:43.000000000 -0500
+++ vile-9.4f/exec.c	2004-04-11 19:10:22.000000000 -0400
@@ -4,7 +4,7 @@
  *	original by Daniel Lawrence, but
  *	much modified since then.  assign no blame to him.  -pgf
  *
- * $Header: /usr/build/vile/vile/RCS/exec.c,v 1.260 2004/03/21 17:25:43 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/exec.c,v 1.261 2004/04/11 23:10:22 tom Exp $
  *
  */
 
@@ -1163,7 +1163,20 @@
 	const char *newvalue = tokval(previous);
 	/* evaluate the token */
 	if ((const char *) previous != newvalue) {
-	    (void) tb_scopy(tok, newvalue);
+	    /*
+	     * Check for the special case where we're just shifting the result
+	     * down by one since we're stripping a leading quote.  I don't want
+	     * to use memmove() in tb_buff.c just for this instance since it's
+	     * less portable -TD
+	     */
+	    if (((const char *) previous) + 1 == newvalue) {
+		TBUFF *fix = 0;
+		tb_scopy(&fix, newvalue);
+		tb_free(tok);
+		*tok = fix;
+	    } else {
+		(void) tb_scopy(tok, newvalue);
+	    }
 	}
 	return (tb_values(*tok));
     }
Index: filters/filters.rc
Prereq:  1.180 
--- vile-9.4e+/filters/filters.rc	2004-03-18 19:37:48.000000000 -0500
+++ vile-9.4f/filters/filters.rc	2004-04-11 15:29:50.000000000 -0400
@@ -1,10 +1,10 @@
-; $Id: filters.rc,v 1.180 2004/03/19 00:37:48 tom Exp $
+; $Id: filters.rc,v 1.186 2004/04/11 19:29:50 tom Exp $
 ; majormodes in this file are ordered alphabetically for convenience - the
 ; precedence used by vile is strictly alphabetic, counting case.
 
 define-mode ada
 ~with define-submode ada
-	suf '\.\(\<ada\>\|\<ads\>\|\<adb\>\)$'
+	suffixes	'\.\(ada\|ads\|adb\)$'
 	comment-prefix	'^\s*--'
 	comments	'^\s*--\s*$'
 	fence-if   '^\s*\<if\>'
@@ -21,13 +21,13 @@
 ; GNU assembler (a Byzantine elaboration of AT&T)
 define-mode as
 ~with define-submode as
-	suf '\.[sS]$'
+	suffixes	'\.[sS]$'
 ~endwith
 
 ; M$ assembler (a Byzantine elaboration of Intel)
 define-mode asm
 ~with define-submode asm
-	suf '\.asm$'
+	suffixes	'\.asm$'
 	fence-if   '^\s*\<\(if\|ifdef\|ifndef\)\>'
 	fence-elif '^\s*\<elseif\>'
 	fence-else '^\s*\<else\>'
@@ -36,7 +36,7 @@
 
 define-mode awk
 ~with define-submode awk
-	suf '\.awk$'
+	suffixes	'\.awk$'
 	pre '^#!\s*\/.*awk\>\(\s*-[\a]\+\)*\s*$'
 	cindent
 	cindent-chars $fences
@@ -46,7 +46,7 @@
 
 define-mode basic
 ~with define-submode basic
-	suf '\.bas$'
+	suffixes	'\.bas$'
 	comment-prefix '^\s*\''
 	comments   '^\s*\'\s\+\s*$'
 	ignorecase
@@ -55,7 +55,7 @@
 
 define-mode bat
 ~with define-submode bat
-	suf '\.\(bat\|cmd\)$'
+	suffixes	'\.\(bat\|cmd\)$'
 	pre '\s*\(@\)\?echo\s*\(on\|off\)\?$'
 	dos
 	ignorecase
@@ -63,9 +63,15 @@
 	comments   '^\s*rem\>\s\+\s*$'
 ~endwith
 
+; we normally use the builtin values, but this is useful for looking at
+; autoconf templates:
+~with define-submode c
+	ignoresuffix	'\.\(in\|orig\|~\)$'
+~endwith
+
 define-mode cfg
 ~with define-submode cfg
-	suf '\.cfg$'
+	suffixes	'\.cfg$'
 	comment-prefix	'^\s*#'
 	comments	'^\s*#\s*$'
 ~endwith
@@ -73,7 +79,7 @@
 define-mode cpp
 ~with define-submode cpp
 	before "c"
-	suf '\(\.\(C\|CC\|cc\|cpp\|cxx\|hxx\|hh\)$\)'
+	suffixes	'\.\(C\|CC\|cc\|cpp\|cxx\|hxx\|hh\)$'
 	cindent
 	cindent-chars   &cat ':#' $fences
 	filtername	'vile-c-filt -k cpp'
@@ -81,7 +87,7 @@
 
 define-mode csh
 ~with define-submode csh
-	suf '\.\(csh[^/]*\|login\|logout\)$'
+	suffixes	'\.\(csh.*\|login\|logout\)$'
 	pre '^#!\s*\/.*csh\>\(\s*-[\a]\+\)*\s*$'
 	filtername	'vile-sh-filt -k csh'
 	comment-prefix	'^\s*#'
@@ -102,7 +108,7 @@
 
 define-mode cweb
 ~with define-submode cweb
-	suf '\(\.w\|\.web\)$'
+	suffixes	'\.\(w\|web\)$'
 ~endwith
 
 ; Fences in DCL do not work well because we really want a fence-if which
@@ -111,7 +117,7 @@
 ; excludes the if-block.
 define-mode dcl
 ~with define-submode dcl
-	suf '\.\(com\|tpu\)$'
+	suffixes	'\.\(com\|tpu\)$'
 	comment-prefix	'^\s*\$!'
 	comments	'^\s*\$!\s*$'
 	ignorecase
@@ -125,35 +131,35 @@
 
 define-mode def
 ~with define-submode def
-	suf '\.\(def\)$'
+	suffixes	'\.\(def\)$'
 	ignorecase
 	dos
 ~endwith
 
 define-mode diff
 ~with define-submode diff
-	suf '\.\(patch\|dif\|diff\|diffs\|rej\)$'
+	suffixes	'\.\(patch\|dif\|diff\|diffs\|rej\)$'
 	pre '^\<diff\>'
 ~endwith
 
 ; ECLiPSe (a dialect of Prolog)
 define-mode ecl
 ~with define-submode ecl
-	suf '\.\(ecl\|pro\)$'
+	suffixes	'\.\(ecl\|pro\)$'
 ~endwith
 
 ; Syntax descriptions for enscript
 ; NOTE: Smalltalk files also may have ".st" suffix.
 define-mode est
 ~with define-submode est
-	suf '\.st$'
+	suffixes	'\.st$'
 	cindent
 ~endwith
 
 ; Embedded SQL in C/C++
 define-mode esql
 ~with define-submode esql
-	suf '\.\(ec\|pc\|ppc\)$'
+	suffixes	'\.\(ec\|pc\|ppc\)$'
 	cindent
 	cindent-chars &cat ':#' $fences
 ~endwith
@@ -162,7 +168,7 @@
 ; FIXME: The groups should not nest (extend the syntax)
 define-mode fdl
 ~with define-submode fdl
-	suf '\.\<fdl\>$'
+	suffixes	'\.\<fdl\>$'
 	comment-prefix '^\s*$rem\>'
 	comments   '^\(\|$rem\)$'
 	fence-if   '^\$\s*if\>'
@@ -198,7 +204,7 @@
 ; Inherit the C-style fences for JavaScript, but add new ones for HTML
 define-mode html
 ~with define-submode html
-	suf '\.\(html\|htm\)$'
+	suffixes	'\.\(html\|htm\)$'
 	pre '\(<html>\|<script>\|<!doctype\|<!--\)'
 	fence-pairs	'<>()[]{}'
 	ignorecase
@@ -218,19 +224,20 @@
 define-mode info
 ~with define-submode info
 	after ti
-	suf '\(\.\|\([a-z]*\)\)\(info\(-\d\+\)\?\)$'
+	mode-filename	'\([a-z]*\)\(info\(-\d\+\)\?\)$'
+	suffixes	'\.\(info\(-\d\+\)\?\)$'
 ~endwith
 
 define-mode imake
 ~with define-submode imake
 	before "def"
-	suf 'I[Mm]akefile[^/]*$'
+	mode-filename	'I[Mm]akefile.*$'
 	pre '^\s*\(XCOMM\>\|\/\*\*\/#\)'
 ~endwith
 
 define-mode java
 ~with define-submode java
-	suf '\.java$'
+	suffixes	'\.java$'
 	filtername 'vile-c-filt -j -p -k java'
 	cindent
 	cindent-chars &cat ':' $fences
@@ -238,7 +245,7 @@
 
 define-mode js
 ~with define-submode js
-	suf '\.\(js\|jsp\)$'
+	suffixes	'\.\(js\|jsp\)$'
 	filtername 'vile-c-filt -p -k js'
 	cindent
 	cindent-chars &cat ':' $fences
@@ -246,7 +253,7 @@
 
 define-mode key
 ~with define-submode key
-	suf '\.\(key\|keywords\)$'
+	suffixes	'\.\(key\|keywords\)$'
 	comment-prefix	'^\s*:'
 	comments	'^\s*:\s+*$'
 ~endwith
@@ -254,7 +261,7 @@
 define-mode latex
 ~with define-submode latex
 	filtername 'vile-latex-filt -a'
-	suf '\.\(latex\|ltex\|ltx\|sty\)$'
+	suffixes	'\.\(latex\|ltex\|ltx\|sty\)$'
 	fence-pairs='<>{}()[]'
 	comment-prefix	'^\s*%'
 	comments	'^\s*%.*$'
@@ -262,14 +269,14 @@
 
 define-mode lex
 ~with define-submode lex
-	suf '\.\(l\|lex\|flex\|flx\)$'
+	suffixes	'\.\(l\|lex\|flex\|flx\)$'
 	cindent
 	cindent-chars &cat ':#' $fences
 ~endwith
 
 define-mode lisp
 ~with define-submode lisp
-	suf '\.\(lisp\|lsp\)$'
+	suffixes	'\.\(lisp\|lsp\)$'
 	fence-pairs='()'
 	fence-begin='#|'
 	fence-end='|#'
@@ -278,7 +285,8 @@
 
 define-mode log
 ~with define-submode log
-	suf '\(\(run\|make\)\.out\|\.log[^/]*\)$'
+	mode-filename	'^\(run\|make\).*\.out$'
+	suffixes	'\.\(log.*\)$'
 	before make
 ~endwith
 
@@ -286,7 +294,7 @@
 define-mode m4
 ~with define-submode m4
 	pre '^\s*dnl\>'
-	suf '\.\(ac\|m4\)$'
+	suffixes	'\.\(ac\|m4\)$'
 	comment-prefix '^\s*\(dnl\|#\)'
 	comments   '^\s*\(dnl\>\|#\)\s*$'
 	fence-if   '^\s*\<if\>'
@@ -303,13 +311,13 @@
 
 define-mode mail
 ~with define-submode mail
-	suf '\([Mm]ail\>[^/]*\|\<mbox\|mutt-[^/]*\)$'
+	mode-filename	'\([Mm]ail\>.*\|\<mbox\|mutt-.*\)$'
 	pre '^\(From \|To: \)'
 ~endwith
 
 define-mode make
 ~with define-submode make
-	suf '\([Mm]akefile[^/]*\|make\..*\|\.mak\|\.mk\)$'
+	mode-filename	'\([Mm]akefile.*\|make\..*\|\.mak\|\.mk\)$'
 	comment-prefix	'^\s*[!#]'
 	comments	'^\s*[!#]\s*$'
 ~elsewith define-submode make group 'gnumake'
@@ -328,7 +336,7 @@
 
 define-mode mms
 ~with define-submode mms
-	suf '\.mms$'
+	suffixes	'\.mms$'
 	comment-prefix	'^\s*[!#]'
 	comments	'^\s*[!#]\s*$'
 	ignorecase
@@ -342,14 +350,14 @@
 ; highlighting, since it may contain very long lines.
 define-mode newsrc
 ~with define-submode newsrc
-	suf '\.\([^/]*newsrc[^/]*\)$'
+	suffixes	'\.\(.*newsrc.*\)$'
 	before "sh"
 ~endwith
 
 define-mode nr
 ~with define-submode nr
 	after "sh"
-	suf '\.\(\([1-9ln][a-z]\?\)\|me\|ms\|man\)$'
+	suffixes	'\.\(\([1-9ln][a-z]\?\)\|me\|ms\|man\)$'
 	pre '^\.\\"'
 	comment-prefix	'^\.\\"'
 	comments	'^\.\\"\s*$'
@@ -357,12 +365,12 @@
 
 define-mode pas
 ~with define-submode pas
-	suf '\.\(p\|pas\)$'
+	suffixes	'\.\(p\|pas\)$'
 ~endwith
 
 define-mode pc
 ~with define-submode pc
-	suf '\(\<printcap[^/]*\)$'
+	mode-filename	'\(\<printcap.*\)$'
 	filtername	'vile-tc-filt -k pc'
 	comment-prefix	'^\s*[:#]'
 	comments	'^\s*[:#]\s*$'
@@ -373,7 +381,7 @@
 define-mode perl
 ~with define-submode perl
 	pre '^#\s*!\s*\.*\/.*perl[0-9]*\>'
-	suf '\.\(pl\|pm\|PL\)$'
+	suffixes	'\.\(pl\|pm\|PL\)$'
 	before "mail"
 	cindent
 	cindent-chars  &cat ':' $fences
@@ -396,7 +404,7 @@
 ; gettext message files
 define-mode pot
 ~with define-submode pot
-	suf '\.\(pot\|po\)$'
+	suffixes	'\.\(pot\|po\)$'
 	comment-prefix '^#'
 	comments       '^#\s*$'
 ~endwith
@@ -404,14 +412,14 @@
 ; PostScript
 define-mode ps
 ~with define-submode ps
-	suf '\.ps$'
+	suffixes	'\.ps$'
 ~endwith
 
 ; Python
 define-mode py
 ~with define-submode py
 	pre '^\(\(#!\s*\/.*python[\d_.-]*\>\(\s*[-]\+[\a]*\s*\)\?\)\|:\)\s*$'
-	suf '\.py$'
+	suffixes	'\.py$'
 	comment-prefix '^\s*#'
 	comments   '^\s*#\s\+\s*$'
 ~endwith
@@ -421,13 +429,13 @@
 ~with define-submode rb
 	filtername 'vile-ruby-filt -k rb'
 	pre '^#\s*!\s*\.*\/.*ruby*\>'
-	suf '\.rb$'
+	suffixes	'\.rb$'
 ~endwith
 
 define-mode rc
 ~with define-submode rc
 	after "vile"
-	suf '\.rc\d*$'
+	suffixes	'\.rc\d*$'
 	preamble '^\s*[^;"]'
 	qualifiers=all
 	comment-prefix	'^\s*//'
@@ -437,7 +445,7 @@
 define-mode rexx
 ~with define-submode rexx
 	pre '^#\s*!\s*\.*\/.*\(rexx\|regina\|rxcurses\)\>'
-	suf '\.\(cmd\|rexx\)$'
+	suffixes	'\.\(cmd\|rexx\)$'
 	~if &not &seq $os "win32"
 		before "bat"
 	~endif
@@ -450,19 +458,19 @@
 ; such as 'makemode').
 define-mode RCS
 ~with define-submode RCS
-	suf ',v$'
+	mode-filename	',v$'
 	filtername 'vile-rcs-filt'
 ~endwith
 
 define-mode rpm
 ~with define-submode rpm
-	suf '.spec$'
+	suffixes	'\.spec$'
 ~endwith
 
 ; (see RCS)
 define-mode SCCS
 ~with define-submode SCCS
-	suf '\<s\.'
+	mode-filename	'^s\.'
 	pre '^\
h'
 	filtername 'vile-sccs-filt'
 ~elsewith define-submode SCCS group 'delete'
@@ -475,7 +483,7 @@
 
 define-mode sed
 ~with define-submode sed
-	suf '\(sed\)$'
+	suffixes	'\.\(sed\)$'
 	pre '^#!\s*\/sed\>\(\s*-[\a]*\s*\)\*\s*$'
 	comment-prefix	'^\s*#'
 	comments	'^\s*#\s*$'
@@ -484,7 +492,8 @@
 ; This is matched after 'csh', and will pick up /bin/sh, /bin/bash, /bin/ksh
 define-mode sh
 ~with define-submode sh
-	suf '\(\.\(sh\|ksh\|[^/]*rc\)$\|profile$\|\.bash_[a-z]\+$\)'
+	mode-filename	'profile$'
+	suffixes	'\(\.\(sh\|ksh\|shar\|.*rc\)$\|\.bash_[a-z]\+$\)'
 	pre '^\(\(#!\s*\/.*sh\>\(\s*[-]\+[\a]*\s*\)\?\)\|:\)\s*$'
 	comment-prefix	'^\s*[:#]'
 	comments	'^\s*[:#]\s*$'
@@ -504,7 +513,7 @@
 
 define-mode sml
 ~with define-submode sml
-	suf '\.sml$'
+	suffixes	'\.sml$'
 	comment-prefix	'^\s*[*]'
 	fence-begin="(\\*"
 	fence-end="\\*)"
@@ -513,7 +522,7 @@
 define-mode sql
 ~with define-submode sql
 	before "bat"
-	suf '\.sql$'
+	suffixes	'\.sql$'
 	pre '^\s*\(rem\>.*$\|remark\>.*$\|set\s\+echo\s\+\(on\|off\)\?$\)'
 	comment-prefix	'^\s*rem\(ark\)\?'
 	comments	'^\s*rem\(ark\)\?\s*$'
@@ -534,7 +543,7 @@
 
 define-mode tags
 ~with define-submode tags
-	suf '\<tags$'
+	mode-filename	'^tags$'
 	comment-prefix	'^!_'
 	comments	'^!_$'
 ~endwith
@@ -542,14 +551,15 @@
 ; VILE's mktbls
 define-mode tbl
 ~with define-submode tbl
-	suf '\(modetbl\|cmdtbl\)$'
+	mode-filename	'^\(modetbl\|cmdtbl\)$'
 	comment-prefix	'^\s*#'
 	comments	'^\s*#\s*$'
 ~endwith
 
 define-mode tc
 ~with define-submode tc
-	suf '\(\.tc\|\.tcap\|\<termcap[^/]*\)$'
+	mode-filename	'^termcap.*$'
+	suffixes	'\.\(tc\|tcap\)$'
 	comment-prefix	'^\s*[:#]'
 	comments	'^\s*[:#]\s*$'
 ~endwith
@@ -557,7 +567,7 @@
 define-mode tcl
 ~with define-submode tcl
 	before "sh"
-	suf '\.\(tcl\|exp\)$'
+	suffixes	'\.\(tcl\|exp\)$'
 	pre '^#!\s*\/.*\(wish\|wishx\|tclsh\|tcl\|expectk\)[0-9.]*\>\(\s*-[\a]\+\)*\s*$'
 	comment-prefix	'^\s*[:#]'
 	comments	'^\s*[:#]\s*$'
@@ -565,7 +575,7 @@
 
 define-mode tex
 ~with define-submode tex
-	suf '\.\(tex\)$'
+	suffixes	'\.\(tex\)$'
 	filtername 'vile-latex-filt -k tex'
 	fence-pairs='<>{}()[]'
 	comment-prefix	'^\s*%'
@@ -574,20 +584,22 @@
 
 define-mode texi
 ~with define-submode texi
-	suf '\.\(texi\|txi\|texinfo\)$'
+	suffixes	'\.\(texi\|txi\|texinfo\)$'
 ~endwith
 
 define-mode ti
 ~with define-submode ti
 	before "sh"
-	suf '\(\.ti\|\.tinfo\|\<terminfo\(\.src\)\?\)$'
+	mode-filename	'^\<terminfo\(\.src\)\?$'
+	suffixes	'\.\(ti\|tinfo\)$'
 	comment-prefix	'^\s*[:#]'
 	comments	'^\s*[:#]\s*$'
 ~endwith
 
 define-mode txt
 ~with define-submode txt
-	suf '\(\(README\|CHANGES\|Change[Ll]og\|COPYING\)[^/]*\|\.\(txt\|doc\|hlp\)\)$'
+	mode-filename	'^\(\(TODO\|\(\(.*-\)\?README\)\|CHANGES\|Change[Ll]og\|COPYING\).*\)$'
+	suffixes	'\.\(txt\|doc\|hlp\)$'
 	comment-prefix	'^\s*--'
 	comments	'^\s*--\s*$'
 ~endwith
@@ -595,7 +607,7 @@
 define-mode vb
 ~with define-submode vb
 	before "basic"
-	suf '\.\(bas\|frm\)$'
+	suffixes	'\.\(bas\|frm\)$'
 	pre '\(^VERSION\|VB_Name\)'
 	qualifiers=all
 	comment-prefix	'^\s*\''
@@ -608,7 +620,7 @@
 
 define-mode vlog
 ~with define-submode vlog
-	suf '\.v$'
+	suffixes	'\.v$'
 	cindent
 	cindent-chars $fences
 ~endwith
@@ -616,13 +628,16 @@
 ; "define-mode vile" is builtin
 ~with define-submode vile
 	before "sh"
-	suf '\(vile[^/]*rc\|vile.*/[^/]*rc\|\.exrc\|\.vile\)$'
+	mode-pathname	'\(vile.*/.*rc\)$'
+	mode-filename	'\(vile.*rc\)$'
+	suffixes	'\.\(exrc\|vile\)$'
 	comment-prefix	'^\s*;'
 	comments	'^\s*;\s*$'
 	fence-if	'^\s*~if\>'
 	fence-elif	'^\s*~elseif\>'
 	fence-else	'^\s*~else\>'
 	fence-fi	'^\s*~endif\>'
+	sections	'^\s*\(define-mode\|\(\d\+\s*\)\?\(store-\(macro\|procedure\)\)\)'
 ~elsewith define-submode vile group 'while'
 	fence-if	'^\s*~while\>'
 	fence-fi	'^\s*~endwhile\>'
@@ -637,7 +652,7 @@
 
 define-mode vim
 ~with define-submode vim
-	suf '\(\.vim\)$'
+	suffixes	'\.\(vim\)$'
 	comment-prefix	'^\s*"'
 	before "make"
 	filtername	'vile-vile-filt -k vim'
@@ -656,7 +671,7 @@
 
 define-mode xml
 ~with define-submode xml
-	suf '\.xml$'
+	suffixes	'\.xml$'
 	pre '^\s*<?xml\s'
 	fence-pairs	'<>()[]{}'
 	comment-prefix	'^\s*--'
@@ -665,10 +680,10 @@
 
 define-mode xres
 ~with define-submode xres
-	~if $filename-ic
-		suf '\(\.Xdefaults\(-[^/]\+$\)\?\|\.ad\)$'
-	~else
-		suf '\(app-defaults/[A-Z]\?[A-Z][a-z0-9-]\+\|\.Xdefaults\(-[^/]\+$\)\?\|\.ad\)$'
+	mode-filename	'^\(\.Xdefaults\(-.\+$\)\?\)$'
+	suffixes	'\.\(ad\)$'
+	~if &not $filename-ic
+		mode-pathname	'\(app-defaults/[A-Z]\?[A-Z][a-z0-9-]\+\)$'
 	~endif
 	comment-prefix	'^\s*!'
 	comments	'^\s*!\s*$'
@@ -676,14 +691,14 @@
 
 define-mode xs
 ~with define-submode xs
-	suf '\.xs$'
+	suffixes	'\.xs$'
 	cindent
 	cindent-chars &cat ':' $fences
 ~endwith
 
 define-mode yacc
 ~with define-submode yacc
-	suf '\.\(y\|yacc\)$'
+	suffixes	'\.\(y\|yacc\)$'
 	cindent
 	cindent-chars &cat ':#' $fences
 ~endwith
Index: filters/makefile.in
Prereq:  1.78 
--- vile-9.4e+/filters/makefile.in	2003-11-11 15:40:35.000000000 -0500
+++ vile-9.4f/filters/makefile.in	2004-04-11 10:07:20.000000000 -0400
@@ -1,4 +1,4 @@
-# $Header: /usr/build/vile/vile/filters/RCS/makefile.in,v 1.78 2003/11/11 20:40:35 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/makefile.in,v 1.79 2004/04/11 14:07:20 tom Exp $
 #
 
 #### Start of system configuration section. ####
@@ -53,7 +53,6 @@
 QUOTDEFS	= -DVILE_STARTUP_PATH=\"@VILE_STARTUP_PATH@\"
 CPPFLAGS	= -I. -I.. -I$(top_srcdir)/filters -I$(top_srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
 
-DESTDIR		=
 BINDIR		= $(DESTDIR)$(bindir)
 LIBDIR		= $(DESTDIR)$(libdir)
 DATADIR		= $(DESTDIR)$(datadir)
Index: filters/makelist.sh
Prereq:  1.4 
--- vile-9.4e+/filters/makelist.sh	2004-03-17 19:23:12.000000000 -0500
+++ vile-9.4f/filters/makelist.sh	2004-04-11 19:27:58.000000000 -0400
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Header: /usr/build/vile/vile/filters/RCS/makelist.sh,v 1.4 2004/03/18 00:23:12 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/makelist.sh,v 1.5 2004/04/11 23:27:58 tom Exp $
 #
 # Make a list of the names for the specified syntax filters, for the configure
 # script, etc.
@@ -58,7 +58,7 @@
 					fi
 				done
 				if test "$found" = no ; then
-					echo "no such filter: $j" >&2
+					continue
 				elif test -n "$key" ; then
 					key="$key
 $j"
Index: filters/pas-filt.l
Prereq:  1.1 
--- vile-9.4e+/filters/pas-filt.l	2003-12-12 16:48:31.000000000 -0500
+++ vile-9.4f/filters/pas-filt.l	2004-03-22 17:55:06.000000000 -0500
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/pas-filt.l,v 1.1 2003/12/12 21:48:31 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/pas-filt.l,v 1.2 2004/03/22 22:55:06 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Pascal
  * input text.  A few TurboC and Delphi extensions are recognized:
@@ -74,4 +74,5 @@
     while (yylex() > 0) {
     }
     flt_bfr_error();
+    end_state();
 }
Index: globals.c
Prereq:  1.47 
--- vile-9.4e+/globals.c	2003-02-24 19:44:28.000000000 -0500
+++ vile-9.4f/globals.c	2004-04-11 19:24:54.000000000 -0400
@@ -2,7 +2,7 @@
  *	matching lines, then for each such line, an action is performed.
  *	written for vile: Copyright (c) 1990-1999 by Paul Fox
  *
- * $Header: /usr/build/vile/vile/RCS/globals.c,v 1.47 2003/02/25 00:44:28 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/globals.c,v 1.48 2004/04/11 23:24:54 tom Exp $
  *
  */
 
@@ -10,122 +10,121 @@
 #include        "edef.h"
 #include	"nefunc.h"
 
-static	int	globber (CMD_ARGS, int g_or_v);
+static int globber(CMD_ARGS, int g_or_v);
 
 int
 globals(int f, int n)
 {
-	return globber(f,n,'g');
+    return globber(f, n, 'g');
 }
 
 int
 vglobals(int f, int n)
 {
-	return globber(f,n,'v');
+    return globber(f, n, 'v');
 }
 
 /* ARGSUSED */
 static int
 globber(int f GCC_UNUSED, int n GCC_UNUSED, int g_or_v)
 {
-	int c, s;
-	register LINE *lp;
-	register char *fnp;	/* ptr to the name of the cmd to exec */
-	char	cmd[NLINE];
-	const CMDFUNC *cfp;
-	int foundone;
-	int	status;
-	WINDOW *wp, *sw_wp;
-	L_NUM	before;
-	int	save_report;
-
-	c = kbd_delimiter();
-	if ((status = readpattern("global pattern: ", &searchpat,
-				&gregexp, c, FALSE)) != TRUE) {
-		mlforce("[No pattern.]");
-		return status;
-	}
-
-	/* in some sense, it would be nice to search first, before
-                making the user answer the next question, but the
-                searching delay is too long, and unexpected in the
-                middle of a command.  */
-
-	fnp = kbd_engl("action to perform on each matching line: ", cmd);
-	/* get the name of, and then the function to execute */
-	if (!fnp) {
-	        mlforce("[No function]");
-		return FALSE;
-	} else if ((cfp = engl2fnc(fnp)) == 0) {
-	        return no_such_function(fnp);
-	} else if ((cfp->c_flags & GLOBOK) == 0) {
-	        mlforce("[Function not allowed]");
-		return FALSE;
-	}
+    int c, s;
+    LINE *lp;
+    char *fnp;			/* ptr to the name of the cmd to exec */
+    char cmd[NLINE];
+    const CMDFUNC *cfp;
+    int foundone;
+    int status;
+    WINDOW *wp, *sw_wp;
+    L_NUM before;
+    int save_report;
+
+    c = kbd_delimiter();
+    if ((status = readpattern("global pattern: ", &searchpat,
+			      &gregexp, c, FALSE)) != TRUE) {
+	mlforce("[No pattern.]");
+	return status;
+    }
+
+    /* in some sense, it would be nice to search first, before
+       making the user answer the next question, but the
+       searching delay is too long, and unexpected in the
+       middle of a command.  */
+
+    fnp = kbd_engl("action to perform on each matching line: ", cmd);
+    /* get the name of, and then the function to execute */
+    if (!fnp) {
+	mlforce("[No function]");
+	return FALSE;
+    } else if ((cfp = engl2fnc(fnp)) == 0) {
+	return no_such_function(fnp);
+    } else if ((cfp->c_flags & GLOBOK) == 0) {
+	mlforce("[Function not allowed]");
+	return FALSE;
+    }
+
+    /* call the searcher, telling it to do line marking */
+    s = fsearch(FALSE, 0, TRUE, FALSE);
+    if (s != TRUE)
+	return s;
 
+    calledbefore = FALSE;
 
-	/* call the searcher, telling it to do line marking */
-	s = fsearch(FALSE,0,TRUE,FALSE);
-	if (s != TRUE)
-		return s;
-
-	calledbefore = FALSE;
-
-	if (g_or_v == 'v') {  /* invert the sense of all the matches */
-		for_each_line(lp, curbp)
-			lflipmark(lp);
+    if (g_or_v == 'v') {	/* invert the sense of all the matches */
+	for_each_line(lp, curbp)
+	    lflipmark(lp);
+    }
+    /* loop through the buffer -- we must clear the marks no matter what */
+    s = TRUE;
+    lp = lforw(buf_head(curbp));
+    wp = sw_wp = curwp;
+    /* loop until there are no marked lines in the buffer */
+    foundone = FALSE;
+    before = vl_line_count(curbp);
+    save_report = global_g_val(GVAL_REPORT);
+    for_ever {
+	if (lp == win_head(wp)) {
+	    /* at the end -- only quit if we found no
+	       marks on the last pass through. otherwise,
+	       go through again */
+	    if (foundone)
+		foundone = FALSE;
+	    else
+		break;
+	    lsetnotmarked(lp);	/* always unmark the header line */
 	}
-	/* loop through the buffer -- we must clear the marks no matter what */
-	s = TRUE;
-	lp = lforw(buf_head(curbp));
-	wp = sw_wp = curwp;
-	/* loop until there are no marked lines in the buffer */
-	foundone = FALSE;
-	before = vl_line_count(curbp);
-	save_report = global_g_val(GVAL_REPORT);
-	for_ever {
-		if (lp == win_head(wp)) {
-			/* at the end -- only quit if we found no
-				marks on the last pass through. otherwise,
-				go through again */
-			if (foundone)
-				foundone = FALSE;
-			else
-				break;
-			lsetnotmarked(lp); /* always unmark the header line */
+	if (lismarked(lp)) {
+	    foundone = TRUE;
+	    lsetnotmarked(lp);
+	    /* call the function, if there is one, and results
+	       have been ok so far */
+	    if (cfp && s) {
+		if (!calledbefore && (cfp->c_flags & UNDO)) {
+		    if (b_val(wp->w_bufp, MDVIEW))
+			return (rdonly());
+		    mayneedundo();
+		    set_global_g_val(GVAL_REPORT, 0);
 		}
-		if (lismarked(lp)) {
-			foundone = TRUE;
-			lsetnotmarked(lp);
-			/* call the function, if there is one, and results
-				have been ok so far */
-			if (cfp && s) {
-				if (!calledbefore && (cfp->c_flags & UNDO)) {
-					if (b_val(wp->w_bufp,MDVIEW))
-						return(rdonly());
-					mayneedundo();
-					set_global_g_val(GVAL_REPORT,0);
-				}
-				havemotion = &f_godotplus;
-				wp->w_dot.l = lp;
-				wp->w_dot.o = 0;
-				s = call_cmdfunc(cfp, FALSE, 1);
-				if (curwp != wp) {
-				    /* function may have switched on us */
-				    sw_wp = curwp;
-				    (void)set_curwp(wp);
-				}
-				lp = wp->w_dot.l;
-				havemotion = NULL;
-				calledbefore = TRUE;
-			}
+		havemotion = &f_godotplus;
+		wp->w_dot.l = lp;
+		wp->w_dot.o = 0;
+		s = call_cmdfunc(cfp, FALSE, 1);
+		if (curwp != wp) {
+		    /* function may have switched on us */
+		    sw_wp = curwp;
+		    (void) set_curwp(wp);
 		}
-		lp = lforw(lp);
+		lp = wp->w_dot.l;
+		havemotion = NULL;
+		calledbefore = TRUE;
+	    }
 	}
-	set_global_g_val(GVAL_REPORT,save_report);
-	(void)line_report(before);
-	/* if it tried to switch, do it now */
-	(void)set_curwp(sw_wp);
+	lp = lforw(lp);
+    }
+    set_global_g_val(GVAL_REPORT, save_report);
+    (void) line_report(before);
+    /* if it tried to switch, do it now */
+    (void) set_curwp(sw_wp);
 
-	return s;
+    return s;
 }
Index: main.c
Prereq:  1.515 
--- vile-9.4e+/main.c	2004-03-21 17:43:36.000000000 -0500
+++ vile-9.4f/main.c	2004-04-11 11:22:00.000000000 -0400
@@ -22,7 +22,7 @@
  */
 
 /*
- * $Header: /usr/build/vile/vile/RCS/main.c,v 1.515 2004/03/21 22:43:36 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/main.c,v 1.516 2004/04/11 15:22:00 tom Exp $
  */
 
 #define realdef			/* Make global definitions not external */
@@ -1549,7 +1549,7 @@
     set_submode_val("c", MDCINDENT, TRUE);	/* C-style indent */
     set_submode_txt("c", VAL_CINDENT_CHARS, DFT_CINDENT_CHARS);		/* C-style indent flags */
 
-    set_majormode_rexp("c", MVAL_SUFFIXES, DFT_CSUFFIX);
+    set_majormode_rexp("c", MVAL_MODE_SUFFIXES, DFT_CSUFFIX);
 #endif
 
 #if OPT_EVAL
Index: makefile.in
Prereq:  1.189 
--- vile-9.4e+/makefile.in	2003-11-03 18:55:50.000000000 -0500
+++ vile-9.4f/makefile.in	2004-04-11 10:06:32.000000000 -0400
@@ -20,7 +20,7 @@
 #
 # gnu autoconf support by kevin buettner, 5/94
 #
-# $Header: /usr/build/vile/vile/RCS/makefile.in,v 1.189 2003/11/03 23:55:50 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/makefile.in,v 1.190 2004/04/11 14:06:32 tom Exp $
 
 SHELL		= /bin/sh
 
@@ -70,7 +70,7 @@
 #### End of system configuration section. ####
 
 RM		= rm -f
-MAKE_RECUR	= @cf_cv_makeflags@ prefix=$(prefix)
+MAKE_RECUR	= @cf_cv_makeflags@ prefix=$(prefix) DESTDIR=$(DESTDIR)
 
 ICON		= vile
 ICON_SUFFIX	= @ICON_SUFFIX@
@@ -83,7 +83,6 @@
 
 LDFLAGS		= @IMAKE_LOADFLAGS@ @LDFLAGS@
 
-DESTDIR		=
 BINDIR		= $(DESTDIR)$(bindir)
 DATADIR		= $(DESTDIR)$(datadir)
 PERLDIR		= $(DESTDIR)$(perldir)
Index: map.c
Prereq:  1.97 
--- vile-9.4e+/map.c	2002-11-01 18:58:39.000000000 -0500
+++ vile-9.4f/map.c	2004-04-11 15:23:33.000000000 -0400
@@ -3,7 +3,7 @@
  *	Original interface by Otto Lind, 6/3/93
  *	Additional map and map! support by Kevin Buettner, 9/17/94
  *
- * $Header: /usr/build/vile/vile/RCS/map.c,v 1.97 2002/11/01 23:58:39 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/map.c,v 1.99 2004/04/11 19:23:33 tom Exp $
  *
  */
 
@@ -11,7 +11,7 @@
 #include "edef.h"
 
 #if DISP_NTWIN
-# define NTWIN_CURSOR_MINWAIT 550   /* msec */
+# define NTWIN_CURSOR_MINWAIT 550	/* msec */
 #endif
 
 /*
@@ -50,21 +50,26 @@
  *
  */
 
-struct maprec {
-	int		ch;		/* character to match		*/
-	UINT		flags;		/* flags word			*/
-	struct maprec *	dlink;		/* Where to go to match the	*/
-					/*   next character in a multi-	*/
-					/*   character sequence.	*/
-	struct maprec *	flink;		/* Where to try next if match	*/
-					/*   against current character	*/
-					/*   is unsuccessful		*/
-	int		irv;		/* system defined mapping: The	*/
-					/*   (wide) character code to	*/
-					/*   replace a matched sequence by */
-	char	      * srv;		/* user defined mapping: This	*/
-					/*   is the string to replace a	*/
-					/*   matched sequence by	*/
+#define MAPREC struct maprec
+MAPREC {
+    int ch;
+    /* character to match */
+    UINT flags;
+    /* flags word */
+    MAPREC *dlink;
+    /* Where to go to match the next character in a multi-character sequence.
+     */
+    MAPREC *flink;
+    /* Where to try next if match against current character is unsuccessful.
+     */
+    int irv;
+    /* system defined mapping:  The (wide) character code to replace a matched
+     * sequence by.
+     */
+    char *srv;
+    /* user defined mapping:  This is the string to replace a matched sequence
+     * by.
+     */
 };
 
 #define MAPF_SYSTIMER	0x01
@@ -79,23 +84,11 @@
 static struct maprec *map_syskey = NULL;
 static struct maprec *abbr_map = NULL;
 
-static	int	map_common(struct maprec **mpp, const char *bufname, UINT remapflag);
-static	int	unmap_common(struct maprec **mpp, const char *bufname);
-static	void	addtomap(struct maprec **mpp, const char * ks, int kslen, UINT flags, int irv, char * srv);
-static	int	delfrommap(struct maprec **mpp, const char * ks);
-
-static	int	abbr_getc (void);
-static	int	abbr_c_avail (void);
+typedef int (*AvailFunc) (void);
+typedef int (*GetFunc) (void);
+typedef int (*StartFunc) (void);
 
-static	int	mapgetc (void);
-
-typedef	int (*AvailFunc) (void);
-typedef	int (*GetFunc) (void);
-typedef	int (*StartFunc) (void);
-
-static	int	maplookup(int c, ITBUFF **outp, struct maprec *mp, GetFunc get, AvailFunc avail, StartFunc start, int suffix);
-
-#if !OPT_UPBUFF
+#if !OPT_SHOW_MAPS
 #define relist_mappings(name)
 #endif
 
@@ -128,38 +121,39 @@
 	    char *mapstr;
 	    char esc_seq[10];	/* FIXME */
 	    tb_put(&lhsstr, depth, mp->ch);
-	    if (depth+1 >= maxdepth)
-		lhsstack = typereallocn(struct maprec *, lhsstack, maxdepth *= 2);
+	    if (depth + 1 >= maxdepth) {
+		maxdepth *= 2;
+		lhsstack = typereallocn(struct maprec *, lhsstack, maxdepth);
+	    }
 	    lhsstack[depth++] = mp->flink;
 
-	    mapstr = (char *)0;
+	    mapstr = (char *) 0;
 	    if (mp->srv) {
 		mapstr = mp->srv;
 	    } else if (mp->irv != -1) {
-		(void)kcod2escape_seq(mp->irv, esc_seq);
+		(void) kcod2escape_seq(mp->irv, esc_seq);
 		mapstr = esc_seq;
 	    }
 	    if (mapstr) {
-		    if (mapp && (struct maprec *)mapp == abbr_map) {
-			    /* the abbr map is stored inverted */
-			    for (i = depth; i != 0; )
-				bputc(tb_values(lhsstr)[--i]);
+		if (mapp && (struct maprec *) mapp == abbr_map) {
+		    /* the abbr map is stored inverted */
+		    for (i = depth; i != 0;)
+			bputc(tb_values(lhsstr)[--i]);
+		} else {
+		    if (mp->flags & MAPF_NOREMAP) {
+			remapnote = "(n)";
+			footnote++;
 		    } else {
-			    if (mp->flags & MAPF_NOREMAP) {
-				remapnote = "(n)";
-				footnote++;
-			    } else {
-				remapnote = "   ";
-			    }
-			    bprintf("%s ", remapnote);
-			    for (i = 0; i < depth; i++)
-				bputc(tb_values(lhsstr)[i]);
+			remapnote = "   ";
 		    }
-		    bprintf("\t%s\n", mapstr);
+		    bprintf("%s ", remapnote);
+		    for (i = 0; i < depth; i++)
+			bputc(tb_values(lhsstr)[i]);
+		}
+		bprintf("\t%s\n", mapstr);
 	    }
 	    mp = mp->dlink;
-	}
-	else if (depth != 0)
+	} else if (depth != 0)
 	    mp = lhsstack[--depth];
 	else
 	    break;
@@ -168,96 +162,300 @@
 	bprintf("[(n) means never remap]\n");
     }
     tb_free(&lhsstr);
-    free((char *)lhsstack);
+    free((char *) lhsstack);
 }
 
 static int
 show_mapped_chars(const char *bname)
 {
-	struct maprec *mp;
-	if (strcmp(bname, MAP_BufName) == 0)
-		mp = map_command;
-	else if (strcmp(bname, MAPBANG_BufName) == 0)
-		mp = map_insert;
-	else if (strcmp(bname, ABBR_BufName) == 0)
-		mp = abbr_map;
-	else if (strcmp(bname, SYSMAP_BufName) == 0)
-		mp = map_syskey;
-	else
-		return FALSE;
-	return liststuff(bname, FALSE, makemaplist, 0, (void *)mp);
+    struct maprec *mp;
+    if (strcmp(bname, MAP_BufName) == 0)
+	mp = map_command;
+    else if (strcmp(bname, MAPBANG_BufName) == 0)
+	mp = map_insert;
+    else if (strcmp(bname, ABBR_BufName) == 0)
+	mp = abbr_map;
+    else if (strcmp(bname, SYSMAP_BufName) == 0)
+	mp = map_syskey;
+    else
+	return FALSE;
+    return liststuff(bname, FALSE, makemaplist, 0, (void *) mp);
 }
 
 #if OPT_UPBUFF
 static int
 show_Mappings(BUFFER *bp)
 {
-	b_clr_obsolete(bp);
-	return show_mapped_chars(bp->b_bname);
+    b_clr_obsolete(bp);
+    return show_mapped_chars(bp->b_bname);
 }
 
 #undef relist_mappings
 
 static void
-relist_mappings(const char * bufname)
+relist_mappings(const char *bufname)
 {
     update_scratch(bufname, show_Mappings);
 }
-#endif	/* OPT_UPBUFF */
+#endif /* OPT_UPBUFF */
 
-#endif	/* OPT_SHOW_MAPS */
+#endif /* OPT_SHOW_MAPS */
 
-/*
-** set a map for the character/string combo
-*/
-/* ARGSUSED */
-int
-map(int f GCC_UNUSED, int n GCC_UNUSED)
+static void
+addtomap(struct maprec **mpp,
+	 const char *ks,
+	 int kslen,
+	 UINT flags,
+	 int irv,
+	 char *srv)
 {
-    return map_common(&map_command, MAP_BufName, 0);
-}
+    struct maprec *mp = NULL;
 
-/* ARGSUSED */
-int
-map_bang(int f GCC_UNUSED, int n GCC_UNUSED)
-{
-    return map_common(&map_insert, MAPBANG_BufName, 0);
-}
+    if (ks == 0 || kslen == 0)
+	return;
 
-/* ARGSUSED */
-int
-noremap(int f GCC_UNUSED, int n GCC_UNUSED)
-{
-    return map_common(&map_command, MAP_BufName, MAPF_NOREMAP);
-}
+    while (*mpp && kslen) {
+	mp = *mpp;
+	mp->flags |= flags;
+	if (char2int(*ks) == mp->ch) {
+	    mpp = &mp->dlink;
+	    ks++;
+	    kslen--;
+	} else
+	    mpp = &mp->flink;
+    }
 
-/* ARGSUSED */
-int
-noremap_bang(int f GCC_UNUSED, int n GCC_UNUSED)
-{
-    return map_common(&map_insert, MAPBANG_BufName, MAPF_NOREMAP);
+    while (kslen) {
+	mp = typealloc(struct maprec);
+	if (mp == 0)
+	    break;
+	*mpp = mp;
+	mp->dlink = mp->flink = NULL;
+	mp->ch = char2int(*ks++);
+	mp->srv = NULL;
+	mp->flags = flags;
+	mp->irv = -1;
+	mpp = &mp->dlink;
+	kslen--;
+    }
+
+    if (irv != -1)
+	mp->irv = irv;
+    if (srv) {
+	if (mp->srv)
+	    free(mp->srv);
+	mp->srv = strmalloc(srv);
+    }
+    mp->flags = flags;
 }
 
-/* ARGSUSED */
-int
-abbrev(int f GCC_UNUSED, int n GCC_UNUSED)
+static int
+delfrommap(struct maprec **mpp, const char *ks)
 {
-    return map_common(&abbr_map, ABBR_BufName, MAPF_NOREMAP);
+    struct maprec **save_m = mpp;
+    struct maprec ***mstk = 0;
+    const char *save_k = ks;
+    int depth = 0;
+    int pass;
+
+    if (ks == 0 || *ks == 0)
+	return FALSE;
+
+    for (pass = 0; pass < 2; pass++) {
+	mpp = save_m;
+	ks = save_k;
+	depth = 0;
+	while (*mpp && *ks) {
+	    if (pass)
+		mstk[depth] = mpp;
+	    if ((*mpp)->ch == char2int(*ks)) {
+		mpp = &(*mpp)->dlink;
+		ks++;
+		depth++;
+	    } else
+		mpp = &(*mpp)->flink;
+	}
+
+	if (*ks)
+	    return FALSE;	/* not in map */
+	if (!pass)
+	    mstk = typecallocn(struct maprec **, depth + 1);
+    }
+
+    depth--;
+    if ((*mstk[depth])->srv) {
+	free((*mstk[depth])->srv);
+	(*mstk[depth])->srv = NULL;
+    } else if ((*mstk[depth])->irv != -1) {
+	(*mstk[depth])->irv = -1;
+    } else {
+	free((char *) mstk);
+	return FALSE;
+    }
+
+    for (; depth >= 0; depth--) {
+	struct maprec *mp = *mstk[depth];
+	if (mp->irv == -1 && mp->dlink == NULL && mp->srv == NULL) {
+	    *mstk[depth] = mp->flink;
+	    if (depth > 0 && (*mstk[depth - 1])->dlink == mp)
+		(*mstk[depth - 1])->dlink = NULL;
+	    free((char *) mp);
+	} else
+	    break;
+    }
+    free((char *) mstk);
+    return TRUE;
 }
 
-#if OPT_SHOW_MAPS
-/* ARGSUSED */
-int
-sysmap(int f GCC_UNUSED, int n GCC_UNUSED)
+/* do map translations.
+ *	C is first char to begin mapping on
+ *	OUTP is an ITBUFF in which to put the result
+ *	MP is the map in which to look
+ *	GET is a routine to use to get the next character
+ *	AVAIL is the routine that tells if GET can return something now
+ * returns number of characters matched
+ */
+static int
+maplookup(int c,
+	  ITBUFF ** outp,
+	  struct maprec *mp,
+	  GetFunc get,
+	  AvailFunc avail,
+	  StartFunc start,
+	  int suffix)
 {
-	return show_mapped_chars(SYSMAP_BufName);
-}
+    struct maprec *rmp = NULL;
+    ITBUFF *unmatched = 0;
+    int matchedcnt;
+    int use_sys_timing;
+    int had_start = FALSE;
+    register int count = 0;	/* index into 'unmatched[]' */
+
+    /*
+     * We don't want to delay for a user-specified :map!  starting with
+     * poundc since it's likely that the mapping is happening on behalf of
+     * a function key.  (It's so the user can ":map! #1 foobar" but still be
+     * able to insert a '#' character normally.)  If they've changed poundc
+     * so it's not something one normally inserts, then it's okay to delay
+     * on it.
+     */
+    use_sys_timing = (insertmode && c == poundc &&
+		      (isPrint(poundc) || isSpace(poundc)));
+
+    unmatched = itb_init(&unmatched, 0);
+    itb_append(&unmatched, c);
+    count++;
+
+    matchedcnt = 0;
+    while (mp != 0) {
+	if (c == mp->ch) {
+	    if (mp->irv != -1 || mp->srv != NULL) {
+		rmp = mp;
+		matchedcnt += count;
+		unmatched = itb_init(&unmatched, 0);
+		count = 0;
+
+		/* our code supports matching the longer of two maps one of
+		 * which is a subset of the other.  vi matches the shorter
+		 * one.
+		 */
+		if ((*start) ()) {
+		    had_start = TRUE;
+		    if (!global_g_val(GMDMAPLONGER)) {
+			break;
+		    }
+		}
+	    }
+
+	    mp = mp->dlink;
+
+	    if (!mp)
+		break;
+
+	    /* if there's no recorded input, and no user typeahead */
+	    if (!(*avail) ()) {
+
+		/* give it a little extra time... */
+		int timer = 0;
+#if DISP_NTWIN
+		int cursor_state = 0;
 #endif
 
+		/* we want to use the longer of the two timers */
+
+		/* get the user timer.  it may be zero */
+		if (!use_sys_timing && (mp->flags & MAPF_USERTIMER) != 0)
+		    timer = global_g_val(GVAL_TIMEOUTUSERVAL);
+
+		/* if there was no user timer, or this is a system
+		   sequence, use the system timer if it's bigger */
+		if (timer == 0 || (mp->flags & MAPF_SYSTIMER) != 0) {
+		    if (timer < global_g_val(GVAL_TIMEOUTVAL))
+			timer = global_g_val(GVAL_TIMEOUTVAL);
+		}
+#if DISP_NTWIN
+		if (timer > NTWIN_CURSOR_MINWAIT) {
+		    /*
+		     * editor waits for a potentially long time for the next
+		     * character, during which the cursor will be invisible; so
+		     * turn it back on.  unfortunately, the cursor won't blink
+		     * because there's no thread driving the message pump.
+		     */
+		    cursor_state = winvile_cursor_state(TRUE, FALSE);
+		}
+#endif
+		catnap(timer, TRUE);
+#if DISP_NTWIN
+		if (timer > NTWIN_CURSOR_MINWAIT)	/* restore cursor state */
+		    (void) winvile_cursor_state(cursor_state, FALSE);
+#endif
+
+		if (!(*avail) ())
+		    break;
+	    }
+
+	    if ((c = (*get) ()) < 0)
+		break;
+
+	    itb_append(&unmatched, c & ~REMAPFLAGS);
+	    count++;
+
+	} else
+	    mp = mp->flink;
+    }
+
+    if (had_start && (rmp != 0)) {
+	/* unget the unmatched suffix */
+	while (suffix && (count > 0))
+	    (void) itb_append(outp, itb_values(unmatched)[--count]);
+	/* unget the mapping and elide correct number of recorded chars */
+	if (rmp->srv) {
+	    UINT remapflag;
+	    char *cp;
+	    /* cp = rmp->srv + cnt; */
+	    for (cp = rmp->srv; *cp; cp++) ;
+	    if (rmp->flags & MAPF_NOREMAP)
+		remapflag = NOREMAP;
+	    else
+		remapflag = 0;
+	    while (cp > rmp->srv)
+		(void) itb_append(outp, char2int(*--cp) | remapflag);
+	} else {
+	    (void) itb_append(outp, rmp->irv);
+	}
+    } else {			/* didn't find a match */
+	while (count > 0)
+	    (void) itb_append(outp, itb_values(unmatched)[--count]);
+	matchedcnt = 0;
+    }
+    itb_free(&unmatched);
+    return matchedcnt;
+}
+
 static int
 map_common(struct maprec **mpp, const char *bufname, UINT remapflag)
 {
-    int	 status;
+    int status;
     static TBUFF *kbuf;
     static TBUFF *val;
     int len;
@@ -269,18 +467,18 @@
 #endif
     tb_scopy(&kbuf, "");
     status = kbd_reply("change this string: ", &kbuf, eol_history,
-			' ', KBD_NOMAP|KBD_NOEVAL, no_completion);
+		       ' ', KBD_NOMAP | KBD_NOEVAL, no_completion);
     if (status != TRUE)
 	return status;
 
     hst_glue(' ');
     tb_scopy(&val, "");
     if (!clexec) {
-	    status = kbd_reply("to this new string: ", &val, eol_history,
-			'\n', KBD_NOMAP, no_completion);
+	status = kbd_reply("to this new string: ", &val, eol_history,
+			   '\n', KBD_NOMAP, no_completion);
     } else {
-	    (void)mac_literalarg(&val); /* consume to end of line */
-	    status = tb_length(val) > 1;
+	(void) mac_literalarg(&val);	/* consume to end of line */
+	status = tb_length(val) > 1;
     }
     if (status != TRUE)
 	return status;
@@ -291,21 +489,107 @@
 	int i;
 	char t;
 	char *s = tb_values(kbuf);
-	for (i = 0; i < len/2; i++) {
-	    t = s[len-i-1];
-	    s[len-i-1] = s[i];
+	for (i = 0; i < len / 2; i++) {
+	    t = s[len - i - 1];
+	    s[len - i - 1] = s[i];
 	    s[i] = t;
 	}
     }
 
-    addtomap(mpp, tb_values(kbuf), len, MAPF_USERTIMER|remapflag, -1, tb_values(val));
+    addtomap(mpp, tb_values(kbuf), len,
+	     MAPF_USERTIMER | remapflag, -1, tb_values(val));
     relist_mappings(bufname);
     return TRUE;
 }
 
+static int
+unmap_common(struct maprec **mpp, const char *bufname)
+{
+    int status;
+    static TBUFF *kbuf;
+
+    /* otherwise it'll be mapped, and not found when looked up */
+    if (mpp && mpp == &map_syskey)
+	suppress_sysmap = TRUE;
+
+    tb_scopy(&kbuf, "");
+    status = kbd_reply("unmap string: ", &kbuf, eol_history,
+		       ' ', KBD_NOMAP, no_completion);
+    suppress_sysmap = FALSE;
+    if (status != TRUE)
+	return status;
+
+    if ((*mpp && *mpp == abbr_map) || (strcmp(bufname, ABBR_BufName) == 0)) {
+	/* reverse the lhs */
+	int i;
+	char t;
+	int len = tb_length(kbuf) - 1;
+	char *s = tb_values(kbuf);
+	for (i = 0; i < len / 2; i++) {
+	    t = s[len - i - 1];
+	    s[len - i - 1] = s[i];
+	    s[i] = t;
+	}
+    }
+
+    if (delfrommap(mpp, tb_values(kbuf)) != TRUE) {
+	mlforce("[Sequence not mapped]");
+	return FALSE;
+    }
+    relist_mappings(bufname);
+    return TRUE;
+}
+
+/*
+ * set a map for the character/string combo
+ */
+/* ARGSUSED */
+int
+map(int f GCC_UNUSED, int n GCC_UNUSED)
+{
+    return map_common(&map_command, MAP_BufName, 0);
+}
+
+/* ARGSUSED */
+int
+map_bang(int f GCC_UNUSED, int n GCC_UNUSED)
+{
+    return map_common(&map_insert, MAPBANG_BufName, 0);
+}
+
+/* ARGSUSED */
+int
+noremap(int f GCC_UNUSED, int n GCC_UNUSED)
+{
+    return map_common(&map_command, MAP_BufName, MAPF_NOREMAP);
+}
+
+/* ARGSUSED */
+int
+noremap_bang(int f GCC_UNUSED, int n GCC_UNUSED)
+{
+    return map_common(&map_insert, MAPBANG_BufName, MAPF_NOREMAP);
+}
+
+/* ARGSUSED */
+int
+abbrev(int f GCC_UNUSED, int n GCC_UNUSED)
+{
+    return map_common(&abbr_map, ABBR_BufName, MAPF_NOREMAP);
+}
+
+#if OPT_SHOW_MAPS
+/* ARGSUSED */
+int
+sysmap(int f GCC_UNUSED, int n GCC_UNUSED)
+{
+    return show_mapped_chars(SYSMAP_BufName);
+}
+#endif
+
 /*
-** remove map entry, restore saved CMDFUNC for key
-*/
+ * remove map entry, restore saved CMDFUNC for key
+ */
 /* ARGSUSED */
 int
 unmap(int f GCC_UNUSED, int n GCC_UNUSED)
@@ -334,164 +618,14 @@
     return unmap_common(&abbr_map, ABBR_BufName);
 }
 
-static int
-unmap_common(struct maprec **mpp, const char *bufname)
-{
-    int	 status;
-    static TBUFF *kbuf;
-
-    /* otherwise it'll be mapped, and not found when looked up */
-    if (mpp && mpp == &map_syskey)
-	suppress_sysmap = TRUE;
-
-    tb_scopy(&kbuf, "");
-    status = kbd_reply("unmap string: ", &kbuf, eol_history,
-			' ', KBD_NOMAP, no_completion);
-    suppress_sysmap = FALSE;
-    if (status != TRUE)
-	return status;
-
-    if ((*mpp && *mpp == abbr_map) || (strcmp(bufname, ABBR_BufName) == 0)) {
-	/* reverse the lhs */
-	int i;
-	char t;
-	int len = tb_length(kbuf) - 1;
-	char *s = tb_values(kbuf);
-	for (i = 0; i < len/2; i++) {
-	    t = s[len-i-1];
-	    s[len-i-1] = s[i];
-	    s[i] = t;
-	}
-    }
-
-    if (delfrommap(mpp, tb_values(kbuf)) != TRUE) {
-	mlforce("[Sequence not mapped]");
-	return FALSE;
-    }
-    relist_mappings(bufname);
-    return TRUE;
-}
-
 /* addtosysmap is used to initialize the system default function key map
 */
 void
-addtosysmap(const char * seq, int seqlen, int code)
-{
-    addtomap(&map_syskey, seq, seqlen, MAPF_SYSTIMER,
-			code, (char *)0);
-}
-
-static void
-addtomap(
-    struct maprec **mpp,
-    const char * ks,
-    int 	kslen,
-    UINT	flags,
-    int		irv,
-    char *	srv)
-{
-    struct maprec *mp = NULL;
-
-    if (ks == 0 || kslen == 0)
-	return;
-
-    while (*mpp && kslen) {
-	mp = *mpp;
-	mp->flags |= flags;
-	if (char2int(*ks) == mp->ch) {
-	    mpp = &mp->dlink;
-	    ks++;
-	    kslen--;
-	}
-	else
-	    mpp = &mp->flink;
-    }
-
-    while (kslen) {
-	mp = typealloc(struct maprec);
-	if (mp == 0)
-	    break;
-	*mpp = mp;
-	mp->dlink = mp->flink = NULL;
-	mp->ch = char2int(*ks++);
-	mp->srv = NULL;
-	mp->flags = flags;
-	mp->irv = -1;
-	mpp = &mp->dlink;
-	kslen--;
-    }
-
-    if (irv != -1)
-	mp->irv = irv;
-    if (srv) {
-	if (mp->srv)
-	    free(mp->srv);
-	mp->srv = strmalloc(srv);
-    }
-    mp->flags = flags;
-}
-
-static int
-delfrommap(struct maprec **mpp, const char * ks)
+addtosysmap(const char *seq, int seqlen, int code)
 {
-    struct maprec **save_m = mpp;
-    struct maprec ***mstk = 0;
-    const char *save_k = ks;
-    int depth = 0;
-    int pass;
-
-    if (ks == 0 || *ks == 0)
-	return FALSE;
-
-    for (pass = 0; pass < 2; pass++) {
-	mpp   = save_m;
-	ks    = save_k;
-	depth = 0;
-	while (*mpp && *ks) {
-	    if (pass)
-		mstk[depth] = mpp;
-	    if ((*mpp)->ch == char2int(*ks)) {
-		mpp = &(*mpp)->dlink;
-		ks++;
-		depth++;
-	    }
-	    else
-		mpp = &(*mpp)->flink;
-	}
-
-	if (*ks)
-	    return FALSE;		/* not in map */
-	if (!pass)
-	    mstk = typecallocn(struct maprec **, depth+1);
-    }
-
-    depth--;
-    if ((*mstk[depth])->srv) {
-	free((*mstk[depth])->srv);
-	(*mstk[depth])->srv = NULL;
-    } else if ((*mstk[depth])->irv != -1) {
-	(*mstk[depth])->irv = -1;
-    } else {
-	free((char *)mstk);
-	return FALSE;
-    }
-
-    for (; depth >= 0; depth--) {
-	struct maprec *mp = *mstk[depth];
-	if (mp->irv == -1 && mp->dlink == NULL && mp->srv == NULL) {
-	    *mstk[depth] = mp->flink;
-	    if (depth > 0 && (*mstk[depth-1])->dlink == mp)
-		(*mstk[depth-1])->dlink = NULL;
-	    free((char *)mp);
-	}
-	else
-	    break;
-    }
-    free((char *)mstk);
-    return TRUE;
+    addtomap(&map_syskey, seq, seqlen, MAPF_SYSTIMER, code, (char *) 0);
 }
 
-
 #define INPUT_FROM_TTGET 1
 #define INPUT_FROM_MAPGETC 2
 
@@ -540,28 +674,28 @@
     endofDisplay();
 }
 
-/* these two wrappers are provided because at least one pcc-based
-	compiler balks at passing term.getch or term.typahead as a function pointer */
-
+/* These two wrappers are provided because at least one pcc-based compiler
+ * balks at passing term.getch or term.typahead as a function pointer.
+ */
 static int
 normal_getc(void)
 {
-	int c = term.getch();
-	TRACE(("normal/getc:%c (%#x)\n", c, c));
-	save_keystroke(c);
-	return c;
+    int c = term.getch();
+    TRACE(("normal/getc:%c (%#x)\n", c, c));
+    save_keystroke(c);
+    return c;
 }
 
 static int
 normal_typeahead(void)
 {
-	return(term.typahead());
+    return (term.typahead());
 }
 
 static int
 normal_start(void)
 {
-	return TRUE;
+    return TRUE;
 }
 
 int
@@ -574,7 +708,7 @@
 	return itb_last(sysmappedchars);
 
     if ((c = term.getch()) == -1)
-	return c;	/* see comment in ttgetc */
+	return c;		/* see comment in ttgetc */
 
     TRACE(("mapped/getc:%c (%#x)\n", c, c));
 
@@ -584,8 +718,8 @@
 	return c;
 
     /* will push back on sysmappedchars successful, or not */
-    (void)maplookup(c, &sysmappedchars, map_syskey,
-		normal_getc, normal_typeahead, normal_start, TRUE);
+    (void) maplookup(c, &sysmappedchars, map_syskey,
+		     normal_getc, normal_typeahead, normal_start, TRUE);
 
     return itb_last(sysmappedchars);
 }
@@ -596,22 +730,20 @@
     return itb_more(sysmappedchars) || (!mapgetc_ungotcnt && term.typahead());
 }
 
-
-/* make the assumption that no input will magically appear
- * (un)available to tgetc in between a mapungetc and the next mapgetc.
- * Hence characters can't be ungotten onto the wrong buffer (exception
- * is the last tgot char might be mapungot onto the map buffer.  This
- * is OK (if assumption holds) because the next character will be
- * gotten from this buffer.
+/*
+ * Make the assumption that no input will magically appear (un)available to
+ * tgetc in between a mapungetc and the next mapgetc.  Hence characters can't
+ * be ungotten onto the wrong buffer (exception is the last tgot char might be
+ * mapungot onto the map buffer.  This is OK (if assumption holds) because the
+ * next character will be gotten from this buffer.
  */
-
 void
 mapungetc(int c)
 {
     if (tgetc_avail()) {
 	tungetc(c);
     } else {
-	(void)itb_append(&mapgetc_ungottenchars, c);
+	(void) itb_append(&mapgetc_ungottenchars, c);
 	mapgetc_ungotcnt++;
     }
 }
@@ -629,16 +761,18 @@
 	remapflag = NOREMAP;
 
     if (!tgetc_avail() && mapgetc_ungotcnt > 0) {
-	    if (infloopcount++ > global_g_val(GVAL_MAPLENGTH)) {
-		(void)itb_init(&mapgetc_ungottenchars, esc_c);
-		mapgetc_ungotcnt = 0;
-		mlforce("[Infinite loop detected in %s sequence]",
-			    (insertmode) ? "map!" : "map");
-		catnap(1000,FALSE);  /* FIXME: be sure message gets out */
-		return esc_c|NOREMAP;
-	    }
-	    mapgetc_ungotcnt--;
-	    return itb_last(mapgetc_ungottenchars) | remapflag;
+	++infloopcount;
+	if (infloopcount > global_g_val(GVAL_MAPLENGTH)
+	    && infloopcount > 25) {
+	    (void) itb_init(&mapgetc_ungottenchars, esc_c);
+	    mapgetc_ungotcnt = 0;
+	    mlforce("[Infinite loop detected in %s sequence]",
+		    (insertmode) ? "map!" : "map");
+	    catnap(1000, FALSE);	/* FIXME: be sure message gets out */
+	    return esc_c | NOREMAP;
+	}
+	mapgetc_ungotcnt--;
+	return itb_last(mapgetc_ungottenchars) | remapflag;
     }
     infloopcount = 0;
     return tgetc(mapgetc_raw_flag);
@@ -688,45 +822,50 @@
 	mp = map_command;
 
     /* if we got a function key from the lower layers, turn it into '#c'
-	and see if the user remapped that */
+       and see if the user remapped that */
     if ((c & SPEC)
 #if OPT_KEY_MODIFY
-     && !(c & mod_KEY)	/* we don't do this special case */
+	&& !(c & mod_KEY)	/* we don't do this special case */
 #endif
-     ) {
+	) {
 	mapungetc(kcod2key(c));
 	c = poundc;
 	speckey = TRUE;
     }
 
     do {
-	(void)itb_init(&mappedchars, esc_c);
+	(void) itb_init(&mappedchars, esc_c);
 
-	matched = maplookup(c, &mappedchars, mp, mapgetc, mapped_c_avail, mapped_c_start, TRUE);
+	matched = maplookup(c,
+			    &mappedchars,
+			    mp,
+			    mapgetc,
+			    mapped_c_avail,
+			    mapped_c_start,
+			    TRUE);
 
-
-	while(itb_more(mappedchars))
+	while (itb_more(mappedchars))
 	    mapungetc(itb_next(mappedchars));
 
 	/* if the user has not mapped '#c', we return the wide code we got
-	    in the first place.  unless they wanted it quoted.  then we
-	    leave it as is */
+	   in the first place.  unless they wanted it quoted.  then we
+	   leave it as is */
 	if (!raw && speckey && !matched) {
 	    c = mapgetc() & ~REMAPFLAGS;
 	    if (c != poundc)
-		    dbgwrite("BUG: # problem in mapped_c");
+		dbgwrite("BUG: # problem in mapped_c");
 	    return (mapgetc() & ~REMAPFLAGS) | SPEC;
 	}
 
 	c = mapgetc();
 
 	if (!global_g_val(GMDREMAPFIRST))
-		matched = FALSE;
+	    matched = FALSE;
 
 	speckey = FALSE;
 
     } while (matched &&
-	((remap && !(c & NOREMAP)) || (c & YESREMAP)) );
+	     ((remap && !(c & NOREMAP)) || (c & YESREMAP)));
 
     return c & ~REMAPFLAGS;
 
@@ -739,7 +878,7 @@
 abbr_getc(void)
 {
     if (abbr_curr_off <= abbr_search_lim)
-	return -1; /* won't match anything in the tree */
+	return -1;		/* won't match anything in the tree */
     return lgetc(DOT.l, --abbr_curr_off) & 0xff;
 }
 
@@ -753,18 +892,18 @@
 abbr_c_start(void)
 {
     if (abbr_curr_off > abbr_search_lim) {
-	/* we need to check the char in front of the match.
-	   if it's a similar type to the first char of the match,
-	   i.e. both idents, or both non-idents, we do nothing.
-	   if whitespace precedes either ident or non-ident, the
-	   match is good.
+	/*
+	 * We need to check the char in front of the match.  If it's a similar
+	 * type to the first char of the match, i.e. both idents, or both
+	 * non-idents, we do nothing.  If whitespace precedes either ident or
+	 * non-ident, the match is good.
 	 */
 	int first, prev;
-	first = lgetc(DOT.l,abbr_curr_off);
-	prev = lgetc(DOT.l,abbr_curr_off-1);
+	first = lgetc(DOT.l, abbr_curr_off);
+	prev = lgetc(DOT.l, abbr_curr_off - 1);
 	if ((isident(first) && isident(prev)) ||
 	    (!isident(first) && !(isident(prev) || isSpace(prev)))) {
-		return FALSE;
+	    return FALSE;
 	}
     }
     return TRUE;
@@ -781,201 +920,46 @@
 	return;
     abbr_curr_off = DOT.o;
     abbr_search_lim = *backsp_limit_p;
-    (void)itb_init(&abbr_chars, esc_c);
+    (void) itb_init(&abbr_chars, esc_c);
     matched = maplookup(abbr_getc(), &abbr_chars, abbr_map,
-	abbr_getc, abbr_c_avail, abbr_c_start, FALSE);
-
+			abbr_getc, abbr_c_avail, abbr_c_start, FALSE);
 
     if (matched) {
-	    /* there are still some conditions that have to be met by
-	       the preceding chars, if any */
-	    if (!abbr_c_start()) {
-		itb_free(&abbr_chars);
-		return;
-	    }
-	    DOT.o -= matched;
-	    ldelete((B_COUNT)matched, FALSE);
-	    while(status && itb_more(abbr_chars))
-		status = inschar(itb_last(abbr_chars), backsp_limit_p);
+	/* there are still some conditions that have to be met by
+	   the preceding chars, if any */
+	if (!abbr_c_start()) {
+	    itb_free(&abbr_chars);
+	    return;
+	}
+	DOT.o -= matched;
+	ldelete((B_COUNT) matched, FALSE);
+	while (status && itb_more(abbr_chars))
+	    status = inschar(itb_last(abbr_chars), backsp_limit_p);
     }
     itb_free(&abbr_chars);
     return;
 }
 
-/* do map tranlations.
-	C is first char to begin mapping on
-	OUTP is an ITBUFF in which to put the result
-	MP is the map in which to look
-	GET is a routine to use to get the next character
-	AVAIL is the routine that tells if GET can return something now
-  returns number of characters matched
-*/
-static int
-maplookup(
-    int c,
-    ITBUFF **outp,
-    struct maprec *mp,
-    GetFunc get,
-    AvailFunc avail,
-    StartFunc start,
-    int suffix)
-{
-    struct maprec *rmp = NULL;
-    ITBUFF *unmatched = 0;
-    int matchedcnt;
-    int use_sys_timing;
-    int had_start = FALSE;
-    register int count = 0;	/* index into 'unmatched[]' */
-
-    /*
-     * we don't want to delay for a user-specified :map!  starting with
-     * poundc since it's likely that the mapping is happening on behalf of
-     * a function key.  (it's so the user can ":map! #1 foobar" but still be
-     * able to insert a '#' character normally.)  if they've changed poundc
-     * so it's not something one normally inserts, then it's okay to delay
-     * on it.
-     */
-    use_sys_timing = (insertmode && c == poundc &&
-				(isPrint(poundc) || isSpace(poundc)));
-
-    unmatched = itb_init(&unmatched, 0);
-    itb_append(&unmatched, c);
-    count++;
-
-    matchedcnt = 0;
-    while (mp != 0) {
-	if (c == mp->ch) {
-	    if (mp->irv != -1 || mp->srv != NULL) {
-		rmp = mp;
-		matchedcnt += count;
-		unmatched = itb_init(&unmatched, 0);
-		count = 0;
-
-		/* our code supports matching the longer of two maps one of
-		 * which is a subset of the other.  vi matches the shorter
-		 * one.
-		 */
-		if ((*start)()) {
-		    had_start = TRUE;
-		    if (!global_g_val(GMDMAPLONGER)) {
-			break;
-		    }
-		}
-	    }
-
-	    mp = mp->dlink;
-
-	    if (!mp)
-		break;
-
-	    /* if there's no recorded input, and no user typeahead */
-	    if (!(*avail)()) {
-
-		/* give it a little extra time... */
-		int timer = 0;
-#if DISP_NTWIN
-		int cursor_state = 0;
-#endif
-
-		/* we want to use the longer of the two timers */
-
-		/* get the user timer.  it may be zero */
-		if (!use_sys_timing && (mp->flags & MAPF_USERTIMER) != 0)
-			timer = global_g_val(GVAL_TIMEOUTUSERVAL);
-
-		/* if there was no user timer, or this is a system
-			sequence, use the system timer if it's bigger */
-		if (timer == 0 || (mp->flags & MAPF_SYSTIMER) != 0) {
-			if (timer < global_g_val(GVAL_TIMEOUTVAL))
-				timer = global_g_val(GVAL_TIMEOUTVAL);
-		}
-
-#if DISP_NTWIN
-		if (timer > NTWIN_CURSOR_MINWAIT) {
-			/*
-			 * editor waits for a potentially long time
-			 * for the next character, during which the
-			 * cursor will be invisible; so turn it back on.
-			 * unfortunately, the cursor won't blink
-			 * because there's no thread driving the
-			 * message pump.
-			 */
-
-			cursor_state = winvile_cursor_state(TRUE, FALSE);
-		}
-#endif
-		catnap(timer,TRUE);
-#if DISP_NTWIN
-		if (timer > NTWIN_CURSOR_MINWAIT) /* restore cursor state */
-			(void) winvile_cursor_state(cursor_state, FALSE);
-#endif
-
-		if (!(*avail)())
-		    break;
-	    }
-
-	    if ((c = (*get)()) < 0)
-		break;
-
-	    itb_append(&unmatched, c & ~REMAPFLAGS);
-	    count++;
-
-	}
-	else
-	    mp = mp->flink;
-    }
-
-    if (had_start && (rmp != 0)) {
-	/* unget the unmatched suffix */
-	while (suffix && (count > 0))
-	    (void)itb_append(outp, itb_values(unmatched)[--count]);
-	/* unget the mapping and elide correct number of recorded chars */
-	if (rmp->srv) {
-	    UINT remapflag;
-	    char *cp;
-	    /* cp = rmp->srv + cnt; */
-	    for (cp = rmp->srv; *cp; cp++)
-		;
-	    if (rmp->flags & MAPF_NOREMAP)
-		remapflag = NOREMAP;
-	    else
-		remapflag = 0;
-	    while (cp > rmp->srv)
-		(void)itb_append(outp, char2int(*--cp)|remapflag);
-	}
-	else {
-	    (void)itb_append(outp, rmp->irv);
-	}
-    }
-    else {	/* didn't find a match */
-	while (count > 0)
-	    (void)itb_append(outp, itb_values(unmatched)[--count]);
-	matchedcnt = 0;
-    }
-    itb_free(&unmatched);
-    return matchedcnt;
-}
-
 #if NO_LEAKS
 static void
 free_maprec(struct maprec **p)
 {
-	struct	maprec *q;
-	if ((q = *p) != 0) {
-		free_maprec(&(q->flink));
-		free_maprec(&(q->dlink));
-		FreeAndNull(q->srv);
-		*p = 0;
-		free((char *)q);
-	}
+    struct maprec *q;
+    if ((q = *p) != 0) {
+	free_maprec(&(q->flink));
+	free_maprec(&(q->dlink));
+	FreeAndNull(q->srv);
+	*p = 0;
+	free((char *) q);
+    }
 }
 
 void
 map_leaks(void)
 {
-	free_maprec(&map_command);
-	free_maprec(&map_insert);
-	free_maprec(&map_syskey);
-	free_maprec(&abbr_map);
+    free_maprec(&map_command);
+    free_maprec(&map_insert);
+    free_maprec(&map_syskey);
+    free_maprec(&abbr_map);
 }
-#endif	/* NO_LEAKS */
+#endif /* NO_LEAKS */
Index: modes.c
Prereq:  1.269 
--- vile-9.4e+/modes.c	2004-03-21 18:59:08.000000000 -0500
+++ vile-9.4f/modes.c	2004-04-11 19:53:32.000000000 -0400
@@ -7,7 +7,7 @@
  * Major extensions for vile by Paul Fox, 1991
  * Majormode extensions for vile by T.E.Dickey, 1997
  *
- * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.269 2004/03/21 23:59:08 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.274 2004/04/11 23:53:32 tom Exp $
  *
  */
 
@@ -1875,12 +1875,15 @@
 }
 
 void
-set_record_sep(BUFFER *bp, RECORD_SEP value)
+set_record_sep(BUFFER *bp, RECORD_SEP code)
 {
+    if (code == RS_AUTO)
+	code = RS_DEFAULT;
+
     make_local_b_val(bp, MDDOS);
     make_local_b_val(bp, VAL_RECORD_SEP);
-    set_b_val(bp, MDDOS, (value == RS_CRLF));
-    set_b_val(bp, VAL_RECORD_SEP, value);
+    set_b_val(bp, MDDOS, (code == RS_CRLF));
+    set_b_val(bp, VAL_RECORD_SEP, code);
     b_clr_counted(bp);
     (void) bsizes(bp);
     relist_settings();
@@ -1892,14 +1895,11 @@
 int
 chgd_rs(BUFFER *bp, VALARGS * args, int glob_vals, int testing)
 {
-    /* we can set 'auto' only as a global */
-    if (!glob_vals) {
-	if (args->local->vp->i == RS_AUTO)
-	    return FALSE;
-    }
     if (!testing) {
 	if (bp == 0)
 	    return FALSE;
+	if (args->local->vp->i == RS_AUTO)
+	    args->local->vp->i = RS_DEFAULT;
 	set_record_sep(bp, (RECORD_SEP) args->local->vp->i);
     }
 
@@ -2262,7 +2262,8 @@
 {
     struct VAL *mv = my_majormodes[n].data->mm.mv;
 
-    if (mv[m].vp->r != 0
+    if (mv[m].vp != 0
+	&& mv[m].vp->r != 0
 	&& mv[m].vp->r->pat != 0
 	&& mv[m].vp->r->pat[0] != 0
 	&& mv[m].vp->r->reg != 0) {
@@ -3528,7 +3529,7 @@
  * corresponding buffer mode value.
  */
 static int
-get_mm_b_val(int n, int m)
+get_sm_b_val(int n, int m)
 {
     struct VAL *bv = get_sm_vals(my_majormodes[n].data);
     return (bv[m].vp->i);
@@ -3536,6 +3537,28 @@
 #endif
 
 /*
+ * For the given majormode (by index into my_majormodes[]), return the
+ * corresponding buffer mode value.
+ */
+static regexp *
+get_sm_rexp(int n, int m)
+{
+    struct VAL *mv = get_sm_vals(my_majormodes[n].data);
+
+    if (mv[m].vp != 0
+	&& mv[m].vp->r != 0
+	&& mv[m].vp->r->pat != 0
+	&& mv[m].vp->r->pat[0] != 0
+	&& mv[m].vp->r->reg != 0) {
+	TRACE(("get_sm_rexp(%s) %s\n",
+	       my_majormodes[n].shortname,
+	       mv[m].vp->r->pat));
+	return mv[m].vp->r->reg;
+    }
+    return 0;
+}
+
+/*
  * Use a regular expression (normally a suffix, such as ".c") to match the
  * buffer's filename.
  */
@@ -3547,26 +3570,46 @@
     if (my_majormodes[n].flag) {
 	regexp *exp;
 	int savecase = ignorecase;
-	char *fullname = bp->b_fname;
+	char *pathname = bp->b_fname;
+	char *filename;
+	char *suffix;
 	TBUFF *savename = 0;
 
 #if OPT_CASELESS || SYS_VMS
 	ignorecase = TRUE;
 #else
-	ignorecase = get_mm_b_val(n, MDIGNCASE);
+	ignorecase = get_sm_b_val(n, MDIGNCASE);
 #endif
-	if ((exp = b_val_rexp(bp, VAL_STRIPSUFFIX)->reg) != 0
-	    && regexec(exp, fullname, (char *) 0, 0, -1)) {
-	    tb_scopy(&savename, fullname);
-	    strcpy(tb_values(savename) + (exp->startp[0] - fullname),
+	if (((exp = get_sm_rexp(n, VAL_STRIPSUFFIX)) != 0
+	     || (exp = b_val_rexp(bp, VAL_STRIPSUFFIX)->reg) != 0)
+	    && regexec(exp, pathname, (char *) 0, 0, -1)) {
+	    tb_scopy(&savename, pathname);
+	    strcpy(tb_values(savename) + (exp->startp[0] - pathname),
 		   exp->endp[0]);
-	    fullname = tb_values(savename);
+	    pathname = tb_values(savename);
 	}
+	filename = pathleaf(pathname);
+	suffix = strchr(filename, '.');
 
-	if ((exp = get_mm_rexp(n, MVAL_SUFFIXES)) != 0
-	    && regexec(exp, fullname, (char *) 0, 0, -1)) {
-	    TRACE(("test_by_suffix(%s) %s\n",
-		   fullname,
+	if ((exp = get_mm_rexp(n, MVAL_MODE_PATHNAME)) != 0
+	    && regexec(exp, pathname, (char *) 0, 0, -1)) {
+	    TRACE(("test_by_pathname(%s) %s\n",
+		   pathname,
+		   my_majormodes[n].shortname));
+	    result = n;
+	} else if ((exp = get_mm_rexp(n, MVAL_MODE_FILENAME)) != 0
+		   && regexec(exp, filename, (char *) 0, 0, -1)) {
+	    TRACE(("test_by_filename(%s) %s %s\n",
+		   pathname,
+		   filename,
+		   my_majormodes[n].shortname));
+	    result = n;
+	} else if (suffix != 0
+		   && (exp = get_mm_rexp(n, MVAL_MODE_SUFFIXES)) != 0
+		   && regexec(exp, suffix, (char *) 0, 0, -1)) {
+	    TRACE(("test_by_suffixex(%s) %s %s\n",
+		   pathname,
+		   suffix,
 		   my_majormodes[n].shortname));
 	    result = n;
 	}
@@ -3602,7 +3645,7 @@
 #if OPT_CASELESS || SYS_VMS
 	ignorecase = TRUE;
 #else
-	ignorecase = get_mm_b_val(n, MDIGNCASE);
+	ignorecase = get_sm_b_val(n, MDIGNCASE);
 #endif
 	if (exp != 0
 	    && lregexec(exp, lp, 0, llength(lp))) {
@@ -3620,7 +3663,9 @@
 need_suffix_and_preamble(int n)
 {
     if (get_mm_number(n, MVAL_QUALIFIERS) == MMQ_ALL
-	&& get_mm_rexp(n, MVAL_SUFFIXES) != 0
+	&& (get_mm_rexp(n, MVAL_MODE_PATHNAME) != 0
+	    || get_mm_rexp(n, MVAL_MODE_FILENAME) != 0
+	    || get_mm_rexp(n, MVAL_MODE_SUFFIXES) != 0)
 	&& get_mm_rexp(n, MVAL_PREAMBLE) != 0) {
 	TRACE(("need both suffix/preamble for %s\n",
 	       my_majormodes[n].shortname));
Index: modetbl
Prereq:  1.219 
--- vile-9.4e+/modetbl	2004-03-21 18:30:38.000000000 -0500
+++ vile-9.4f/modetbl	2004-04-11 19:43:17.000000000 -0400
@@ -11,7 +11,7 @@
 #
 # The modes are table entries in the BUFFER and WINDOW structures.
 #
-# $Header: /usr/build/vile/vile/RCS/modetbl,v 1.219 2004/03/21 23:30:38 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/modetbl,v 1.224 2004/04/11 23:43:17 tom Exp $
 #
 #
 # Mode-table entries.  Capitalized letters are used for abbreviations.
@@ -184,7 +184,9 @@
 	"qualifiers"	QUALIFIERS	0		# denotes how preamble/suffixes are combined
 regex							# MVAL_ prefix
 	"PREamble"	PREAMBLE	0		# match against file header to turn on mode
-	"SUFfixes"	SUFFIXES	0		# match against filenames to turn on mode
+	"mode-pathname"	MODE_PATHNAME	0		# match against pathnames to turn on mode
+	"mode-filename"	MODE_FILENAME	0		# match against filenames to turn on mode
+	"SUFfixes"	MODE_SUFFIXES	0		# match against filename's suffix to turn on mode
 string
 	"before"	BEFORE		chgd_mm_order	# check mode before given
 	"after"		AFTER		chgd_mm_order	# check mode after given
@@ -303,6 +305,7 @@
 "cat"		CAT		2|STR|SRET	# concatenate string
 "cclass"	CCLASS		1|STR|SRET	# character-class
 "chr"		CHR		1|NUM		# integer to char conversion
+"cmatch"	CMATCH		2|STR|BRET	# caseless regular expression check
 "date"		DATE		2|NUM|SRET	# formatted date/timestamp
 "default"	DEFAULT		1|STR|SRET	# return initial/default value for mode or state-variable
 "divide"	DIV		2|NUM|NRET	# division
@@ -328,6 +331,7 @@
 "lookup"	LOOKUP		2|STR|SRET	# lookup an external file
 "lower"		LOWER		1|STR|SRET	# lower case string
 "lt"		LT		2|NUM|BRET	# logical less than (lessthan)
+"match"		MATCH		2|STR|BRET	# regular expression check
 "middle"	MID		3|STR|SRET	# mid string(string, pos, len)
 "modulo"	MOD		2|NUM|NRET	# modulo
 "negate"	NEG		1|NUM|NRET	# negate
@@ -519,7 +523,7 @@
 "stmcr"		FAB$C_STMCR
 
 .table recordsep
-# "auto"	RS_AUTO
+"default"	RS_AUTO
 "cr"		RS_CR
 "crlf"		RS_CRLF
 "lf"		RS_LF
Index: ntwinio.c
Prereq:  1.133 
--- vile-9.4e+/ntwinio.c	2002-11-05 15:28:02.000000000 -0500
+++ vile-9.4f/ntwinio.c	2004-04-11 12:42:41.000000000 -0400
@@ -1,7 +1,7 @@
 /*
  * Uses the Win32 screen API.
  *
- * $Header: /usr/build/vile/vile/RCS/ntwinio.c,v 1.133 2002/11/05 20:28:02 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/ntwinio.c,v 1.134 2004/04/11 16:42:41 tom Exp $
  * Written by T.E.Dickey for vile (october 1997).
  * -- improvements by Clark Morgan (see w32cbrd.c, w32pipe.c).
  */
@@ -1978,7 +1978,7 @@
 	/* talk about copyright */
 	hwnd = GetDlgItem(hDlg, IDM_ABOUT_COPYRIGHT);
 	sprintf(buf,
-		"\nCopyright \xA9 Thomas Dickey 1997-2002\n\n"
+		"\nCopyright \xA9 Thomas Dickey 1997-2004\n\n"
 		"%s is free software, distributed under the terms of the GNU "
 		"Public License (see COPYING).",
 		prognam);
Index: oneliner.c
Prereq:  1.103 
--- vile-9.4e+/oneliner.c	2004-03-21 16:09:31.000000000 -0500
+++ vile-9.4f/oneliner.c	2004-04-11 14:12:18.000000000 -0400
@@ -4,7 +4,7 @@
  *	Copyright (c) 1990, 1995-1999 by Paul Fox, except for delins(), which is
  *	Copyright (c) 1986 by University of Toronto, as noted below.
  *
- * $Header: /usr/build/vile/vile/RCS/oneliner.c,v 1.103 2004/03/21 21:09:31 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/oneliner.c,v 1.104 2004/04/11 18:12:18 tom Exp $
  */
 
 #include	"estruct.h"
@@ -185,8 +185,7 @@
 	}
 
 	newpattern = 0;
-	if (tb_length(replacepat) != 0)
-	    tb_copy(&newpattern, replacepat);
+	tb_init(&newpattern, EOS);
 	status = readpattern("replacement string: ",
 			     &newpattern, (regexp **) 0, c, FALSE);
 	if (status == ABORT) {
Index: patchlev.h
--- vile-9.4e+/patchlev.h	2004-03-21 19:43:56.000000000 -0500
+++ vile-9.4f/patchlev.h	2004-03-22 17:33:34.000000000 -0500
@@ -1,2 +1,2 @@
 /* set to "" for no patches */
-#define PATCHLEVEL "e"
+#define PATCHLEVEL "f"
Index: perl.xs
Prereq:  1.90 
--- vile-9.4e+/perl.xs	2003-12-12 17:43:11.000000000 -0500
+++ vile-9.4f/perl.xs	2004-03-22 17:37:16.000000000 -0500
@@ -13,7 +13,7 @@
  * vile.  The file api.c (sometimes) provides a middle layer between
  * this interface and the rest of vile.
  *
- * $Header: /usr/build/vile/vile/RCS/perl.xs,v 1.90 2003/12/12 22:43:11 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/perl.xs,v 1.91 2004/03/22 22:37:16 tom Exp $
  */
 
 /*#
@@ -1090,12 +1090,15 @@
     if ((vile_path = getenv("VILE_LIBDIR_PATH")) != 0)
     {
 	const char *cp = vile_path;
+	char result[NFILEN];
 	/*
 	 * "patch" @INC to look (first) for scripts in the directory
 	 * %VILE_LIBDIR_PATH%\\perl .
 	 */
-	while ((cp = parse_pathlist(cp, vile_path)) != 0) {
-	    prepend_include(pathcat(temp, cp, "perl"));
+	TRACE(("perl_init VILE_LIBDIR_PATH=%s\n", vile_path));
+	while ((cp = parse_pathlist(cp, result)) != 0) {
+	    TRACE(("parsed %s\n", cp));
+	    prepend_include(pathcat(temp, result, "perl"));
 	}
     }
 
Index: revlist
--- vile-9.4e+/revlist	2004-03-21 20:41:38.000000000 -0500
+++ vile-9.4f/revlist	2004-04-11 20:45:09.000000000 -0400
@@ -1,6 +1,6 @@
-revlist for vile, version v9_4e
+revlist for vile, version v9_4f
 --------------------------------------------------------------------------------
-CHANGES	1.738
+CHANGES	1.739
 CHANGES.R3	1.1
 CHANGES.R4	1.1
 CHANGES.R5	1.1
@@ -31,7 +31,7 @@
 config_h.in	1.2
 configure	none
 configure.in	1.204
-csrch.c	1.31
+csrch.c	1.32
 curses.c	1.20
 descrip.mms	1.44
 dirstuff.h	1.25
@@ -40,8 +40,8 @@
 dumbterm.c	1.17
 edef.h	1.313
 estruct.h	1.541
-eval.c	1.322
-exec.c	1.260
+eval.c	1.324
+exec.c	1.261
 externs.c	1.8
 fences.c	1.82
 file.c	1.351
@@ -49,7 +49,7 @@
 fileio.c	1.172
 finderr.c	1.118
 glob.c	1.78
-globals.c	1.47
+globals.c	1.48
 gppconio.c	1.2
 history.c	1.76
 ibmpc.c	1.97
@@ -60,41 +60,41 @@
 itbuff.c	1.18
 lckfiles.c	1.11
 line.c	1.160
-main.c	1.515
+main.c	1.516
 makefile.blc	1.17
 makefile.djg	1.32
 makefile.emx	1.5
 makefile.icc	1.13
-makefile.in	1.189
+makefile.in	1.190
 makefile.tbc	1.24
 makefile.wat	1.26
 makefile.wnt	1.77
-map.c	1.97
+map.c	1.99
 menu.c	1.43
 mkdirs.sh	1.5
 mkprlenv.wnt	1.8
 mktbls.c	1.130
-modes.c	1.269
-modetbl	1.219
+modes.c	1.274
+modetbl	1.224
 msgs.c	1.25
 npopen.c	1.89
 ntconio.c	1.76
-ntwinio.c	1.133
-oneliner.c	1.103
+ntwinio.c	1.134
+oneliner.c	1.104
 opers.c	1.87
 os2keys.h	1.1
 os2pipe.c	1.5
 os2vio.c	1.29
-patchlev.h	1.309
+patchlev.h	1.310
 path.c	1.135
-perl.xs	1.90
+perl.xs	1.91
 proto.h	1.522
 pscreen.h	1.1
 ptypemap	1.7
 random.c	1.272
 regexp.c	1.108
 region.c	1.127
-revlist	v9_4e
+revlist	v9_4f
 search.c	1.134
 select.c	1.149
 sinstall.sh	1.1
@@ -110,9 +110,9 @@
 ucrypt.c	1.15
 undo.c	1.84
 version.c	1.55
-vile-9.4.spec	1.5
+vile-9.4.spec	1.7
 vile.1	1.30
-vile.hlp	1.573
+vile.hlp	1.580
 vile.wmconfig	1.1
 vms2unix.c	1.37
 vmsbuild.com	1.39
@@ -135,7 +135,7 @@
 winvile.odl	1.6
 winvile.rc	1.10
 word.c	1.74
-wordmov.c	1.21
+wordmov.c	1.22
 wvwrap.cpp	1.7
 x11.c	1.272
 x11menu.c	1.6
@@ -146,9 +146,9 @@
 doc/dir.doc	1.3
 doc/filters.doc	1.30
 doc/indent.pro	1.4
-doc/macros.doc	1.89
+doc/macros.doc	1.91
 doc/menus.doc	1.7
-doc/modes.doc	1.13
+doc/modes.doc	1.16
 doc/oleauto.doc	1.7
 doc/perl.doc	1.2
 doc/visvile.doc	1.9
@@ -194,7 +194,7 @@
 filters/filterio.c	1.22
 filters/filters.c	1.89
 filters/filters.h	1.81
-filters/filters.rc	1.180
+filters/filters.rc	1.186
 filters/fltstack.h	1.8
 filters/genmake.c	1.4
 filters/genmake.mak	1.23
@@ -221,10 +221,10 @@
 filters/makefile.djg	1.3
 filters/makefile.emx	1.4
 filters/makefile.icc	1.3
-filters/makefile.in	1.78
+filters/makefile.in	1.79
 filters/makefile.wnt	1.30
 filters/makefilt.l	1.49
-filters/makelist.sh	1.4
+filters/makelist.sh	1.5
 filters/manfilt.c	1.35
 filters/mk-0th.awk	1.8
 filters/mk-0th.bat	1.6
@@ -236,7 +236,7 @@
 filters/mms-filt.l	1.9
 filters/nr-filt.l	1.15
 filters/nr.key	1.1
-filters/pas-filt.l	1.1
+filters/pas-filt.l	1.2
 filters/pas.key	1.2
 filters/pc.key	1.1
 filters/perl.key	1.8
Index: vile-9.4.spec
Prereq:  1.5 
--- vile-9.4e+/vile-9.4.spec	2003-11-12 19:42:51.000000000 -0500
+++ vile-9.4f/vile-9.4.spec	2004-03-22 17:33:07.000000000 -0500
@@ -1,7 +1,7 @@
 Summary: VILE VI Like Emacs editor
-# $Header: /usr/build/vile/vile/RCS/vile-9.4.spec,v 1.5 2003/11/13 00:42:51 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/vile-9.4.spec,v 1.7 2004/03/22 22:33:07 tom Exp $
 Name: vile
-Version: 9.4d
+Version: 9.4f
 # each patch should update the version
 Release: 1
 Copyright: GPL
@@ -12,6 +12,8 @@
 Patch2: vile-9.4b.patch.gz
 Patch3: vile-9.4c.patch.gz
 Patch4: vile-9.4d.patch.gz
+Patch5: vile-9.4e.patch.gz
+Patch6: vile-9.4f.patch.gz
 # each patch should add itself to this list
 Packager: Thomas Dickey <dickey@invisible-island.net>
 BuildRoot: %{_tmppath}/%{name}-root
@@ -28,6 +30,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 # each patch should add itself to this list
 
 %build
@@ -75,6 +79,12 @@
 %changelog
 # each patch should add its ChangeLog entries here
 
+* Mon Mar 22 2004 Thomas Dickey
+- added patch for 9.4f
+
+* Mon Mar 22 2004 Thomas Dickey
+- added patch for 9.4e
+
 * Tue Nov 12 2003 Thomas Dickey
 - added patch for 9.4d
 
Index: vile.hlp
Prereq:  1.573 
--- vile-9.4e+/vile.hlp	2004-03-21 18:33:42.000000000 -0500
+++ vile-9.4f/vile.hlp	2004-04-11 19:43:55.000000000 -0400
@@ -75,7 +75,7 @@
 	you can undo it in the other.
 
 	vile supports many, many "modes" (aka options), which are
-	eventually explained in the section entitled "Editor modes".  But
+	thoroughly explained in the section entitled "Editor modes".  But
 	do note that this help file makes references to modes before the
 	concept is fully described.  It's a chicken and egg problem....
 
@@ -1092,50 +1092,109 @@
 
 Editor modes
 ------------
-	Modes come in three "flavors".  They are universal, and affect the
-	editor generally, or are associated with either buffers or with
-	windows, and are usually inherited from a set of "global" buffer
-	and window modes.  The value of a buffer or window mode will track
-	changes to the respective global mode, until the "local" value is
-	set independently of the global one.
-
-	You can also define new modes, called "majormodes", which are
-	collections of buffer mode values, together with qualifiers that
-	automatically assign a majormode to new buffers.  Vile has one
-	built-in majormode, "c" (displayed as "cmode").  The associated
-	majormode values are named according to the corresponding buffer
-	modes, e.g., the "c" majormode's tabstop is predefined as
-	"c-tabstop", or "cts" for short.
-
-	To set or change a global mode, use ":set".  To remove the mode,
-	use ":unset", ":setno", or ":set" with the modename prefixed with
-	"no".
+	Modes come in various flavors and types and constitute the editor's
+	primary configuration mechanism.  vile supports these mode types:
 
-	To set and reset local modes, use ":setl", ":unsetl", ":setlno".
+	    boolean enum int string
 
-	To display modes, use ":setall", ":modes", or ":set all".  Local
+	The value of a mode is specified via "set" or "setl" (the latter
+	command _only_ affects buffer modes, as described below).  Mode
+	values may be cleared with "unset" (or "unsetl" for buffer modes),
+	as well as other idioms described later.  Clearing a mode, by the
+	way, is a fancy way of saying that its value is set to 0 or "", the
+	latter for string types.  When an enum mode is cleared, vile
+	selects whichever enum constant is assigned the internal (read
+	compiled) value of 0.  Some concrete examples:
+
+	    mode type   mode name        example usage
+	    ---------   ---------        ---------------
+	    boolean     autoindent       set autoindent
+	    enum        visual-matches   set visual-matches=reverse
+	    int         fillcol          set fillcol=75
+	    string      tags             set tags="../tags tags"
+
+	Flavor: universal modes
+	-----------------------
+	These modes are not directly associated with buffers, windows, or
+	languages.  Consequently, a universal mode affects the editor under
+	all relevant operating conditions.
+
+	To set/modify a universal mode, use the "set" command.  Startup file
+	examples:
+
+	    set vtflash=normal
+	    unset flash           ; or    set noflash
+	    set errorbells
+
+	Since the set command (within a startup file) accepts multiple modes,
+	this oneliner is equivalent:
+
+	    set vtflash=normal noflash errorbells
+
+	To clear a universal mode use one of these idioms:
+
+	    set    no<modename>
+	    unset  <modename>
+	    setno  <modename>
+
+	For completeness sake, note that the "local" version of the
+	set/unset commands ("setl"/"unsetl") do not make sense (and elicit
+	no effect) when used with universal modes.
+
+	Flavor: buffer modes
+	--------------------
+	These modes are inherited from a set of "global" buffer modes, but
+	bound to a specific buffer once a "local" value is independently
+	established.  To set and reset local modes, use "setl", "unsetl",
+	or "setlno".  An actual example is useful for illustration purposes.
+
+	When vile is started, the global value of "view" mode is unset by
+	default (i.e., false) and all newly visited buffers are editable.
+	But suppose I edited the file "precious.cpp", which I did not want
+	to modify.  There are two approaches that could be taken:
+
+	$ vile
+	:set view          ; enable view mode globally
+	:e precious.cpp    ; edited in "view" mode
+	:e other.cpp       ; ditto
+
+			or
+
+	$ vile
+	:e precious.cpp    ; initially edited in "noview" mode
+	:setl view         ; "view" mode now bound to precious.cpp
+	:e other.cpp       ; edited in "noview" mode
+
+	In the first approach, view mode is enabled globally and consequently
+	affects all existing buffers and all subsequently created buffers.
+	This solution works for the stated goal, but makes it impossible to
+	modify any other buffers.  The second approach affects only the
+	targeted file.
+
+	Flavor: window modes
+	--------------------
+	Similar to buffer modes, window modes are bound to a specific
+	window once a local value is independently established.  These
+	modes are set/cleared with the same commands as buffer modes.
+
+	Flavor: majormodes (later)
+	--------------------------
+	Until the subject of syntax coloring is described, it's not very
+	useful to discuss majormodes.  So, in the listing of modes below,
+	skip over anything tagged with (M).  But don't fret, these modes
+	are described separately in the topic entitled "Majormodes".
+
+	Current mode settings
+	---------------------
+	To display modes, use "setall", "modes", or "set all".  Local
 	mode values are only shown if they differ from the global values,
-	whether they have been independently set or not.  The "local"
-	version of the set/unset commands ("setl"/"unsetl") do not make
-	sense when used with universal modes, since there is only one
-	copy of these.
-
-	To define majormodes, use ":define-majormode".  To remove the
-	majormode, use ":remove-majormode".  Some keywords (e.g., suffixes)
-	are automatically associated with each majormode.  To associate a
-	buffer mode with a majormode, use ":define-submode".  To remove the
-	association, use ":remove-submode".  Once associated, submodes can
-	be set and unset just like regular buffer modes.  Use
-	":show-majormodes" to display the list of majormodes with their
-	associated submodes.  The ":setall" command displays the names of
-	the majormodes only, showing which are currently enabled (i.e.,
-	vile compares each new buffer against the preamble and suffixes to
-	determine if the majormode should be set for that buffer.  Only one
-	majormode can be set for a buffer.
-
-	The possible modes, with synonyms in parentheses, and a trailing U,
-	M, B or W indicating whether the mode is universal, or belongs to
-	majormodes, buffers or windows, are:
+	whether they have been independently set or not.
+
+	Modes in detail
+	---------------
+	Shown next is a listing of vile's various modes.  Synonyms, if they
+	exist, are shown in parentheses and a trailing U, B, W, or M
+	indicates whether the mode is universal, buffer, window or major.
 
 	alt-tabpos (atp) If set, vile will position the cursor over tab and
 		control characters the way emacs would, that is, at the
@@ -1183,7 +1242,7 @@
 		the number of milliseconds to wait before invoking the
 		"autocolor-hook" hook.  The editor will wait the
 		specified amount of time for a "quiet interval" during
-		which the user hasn't pressed any keys.
+		which the user hasn't pressed any keys. (B)
 
 	autowrite (aw)  vile will write out any changed buffers for which
 		this mode is set before performing a ^Z, "stop", "suspend",
@@ -1251,7 +1310,9 @@
 
 	cindent (ci) C-style indentation.  Helps maintain current indentation
 		level automatically during insert, like autoindent, above.
-		See cindent-chars for additional information.  (B)
+		See cindent-chars for additional information.  Note that
+		when the majormode cmode is in effect, cindent assumes a
+		local buffer mode value of true.  (B)
 
 	cindent-chars (cic)  The list of characters interpreted by the cindent
 		mode.  These include
@@ -1267,9 +1328,10 @@
 		pair causes the next line to be indented more, and the
 		right-character causes the next line to be indented less.  (B)
 
-	cmode   C-code mode.  A built-in majormode, also useful for other
-		languages.  Predefines cindent mode and separate suffix, tab and
-		shiftwidth submodes.  (M)
+	cmode	C-code mode.  A built-in majormode that predefines cindent
+		mode and separate suffix, tab and shiftwidth submodes.  The
+		topic "cmode:  the original vile builtin majormode"
+		discusses this majormode in more detail. (M)
 
 	crypt	Causes buffer(s) to be decrypted when read, and encrypted
 		when written.  This is compatible with the UNIX crypt(1)
@@ -1279,7 +1341,7 @@
 
 	color-scheme (cs) An aggregate of fcolor, bcolor, video-attrs and
 		$palette.  Color schemes are defined with the
-		define-color-scheme command.
+		define-color-scheme command. (U)
 
 	comment-prefix A regular expression denoting the portion of a line
 		that is replicated and untouched, except for leading
@@ -1424,8 +1486,9 @@
 	ignorecase (ic) Text searches normally match the pattern exactly.
 		With this set, searches are case-insensitive. (B)
 
-	ignoresuffix (is) Ignore (remove) the given pattern from a filename
-		before matching it for majormode suffixes.  (B)
+	ignoresuffix (is) Strip the given pattern from a filename before
+		matching it for majormode suffixes.  Note well the
+		difference between the mode's name and its behavior. (B)
 
 	implybuffer (ib) Causes vile to create a buffer when you write to a new
 		file, or read from one (e.g., with ":r").  (U)
@@ -1447,7 +1510,7 @@
 		used by the capture.pl script to show when asynchronous data is
 		loading. (B)
 
-	magic Honor unescaped regular expression metacharacters in search
+	magic	Honor unescaped regular expression metacharacters in search
 		strings.  See the section "Regular Expressions" for more
 		detail.  (B)
 
@@ -1465,7 +1528,15 @@
 
 	mini-hilite (mh) When user toggles editing mode in the minibuffer
 		(^G, mini-edit), display the minibuffer with the given
-		attribute.  These are the same as for visual-matches.
+		attribute.  These are the same as for visual-matches. (U)
+
+	mode-filename (mf) A regular expression describing filenames for
+		which the corresponding majormode will be set.  The expression
+		is applied only to the portion of the complete pathname
+		after removing the directory name.  (M)
+
+	mode-pathname (mp) A regular expression describing pathnames for
+		which the corresponding majormode will be set.  (M)
 
 	mouse	for OS/2, enable/disable the mouse in the console-window
 		version.
@@ -1569,9 +1640,10 @@
 
 	recordseparator (rs) Specify format of files that vile reads and
 		writes.  Formats are lf (for Unix), crlf (for DOS), cr (for
-		Macintosh).  When reading from a file, vile determines the file
-		format automatically, and sets a local value for this mode.
-		When reading from a pipe, it uses the global value of
+		Macintosh) and default (lf or crlf, depending on the platform). 
+		When reading from a file, vile determines the file format
+		automatically, and sets a local value for this mode.  When
+		reading from a pipe, it uses the global value of
 		recordseparator to decide how to split lines.  Files created
 		within vile do not automatically have a local recordseparator
 		mode; they inherit the global mode setting.  The commands
@@ -1588,7 +1660,7 @@
 
 	remapfirst Controls whether the first character of a map expanded
 		due to :map or :map! is eligible for remapping.  This is
-		off by default for vi compatibility.
+		off by default for vi compatibility. (U)
 
 	report	A threshold value that is used to control messages that report
 		the number of lines deleted, changed, etc.  (U)
@@ -1625,7 +1697,9 @@
 		independent of hardware tabs and tab characters.  It is the
 		number of columns a line will shift by if the '<<' or '>>'
 		commands are used, and it chooses the next column stop for
-		the cursor if a '^T' or '^D' is typed during insert mode. (B)
+		the cursor if a '^T' or '^D' is typed during insert mode.
+		Note that when the majormode cmode is enabled, shiftwidth
+		assumes the local buffer mode value of 8.  (B)
 
 	showchar (sc) Controls whether the modeline can show the %C formatted
 		character at the current editing position (W).
@@ -1670,10 +1744,12 @@
 		turned on.  When disabled, the format routiine will insert
 		only one space after each sentence.  (U)
 
-	suffixes (suf) A regular expression describing filenames for which
-		the corresponding majormode will be set.  This is arguably
-		misnamed, since the regular expression need not describe
-		only suffixes.  (M)
+	suffixes (suf) A regular expression describing filename suffixes for
+		which the corresponding majormode will be set.  The expression
+		is applied only to the portion of the filename beginning with
+		the first ".".  If more than one of mode-pathname,
+		mode-filename and suffixes are given, they are tested in this
+		order.  (M)
 
 	swap-title For xvile/winvile, if set, the editor displays its title as:
 		    <current buffer name> - <editor name>
@@ -1690,7 +1766,9 @@
 		'^A-<SP>' operator command to eliminate pre-existing tabs
 		from a region of text.  (B)
 
-	tabstop (ts) Set the value for spacing of normal tabstops. (B)
+	tabstop (ts) Set the value for spacing of normal tabstops.
+		Note that when the majormode cmode is enabled, tabstop
+		assumes the local buffer mode value of 8.  (B)
 
 	tagignorecase (tc) Causes tag searches to be done ignoring upper
 		and lower case. (B)
@@ -2704,6 +2782,7 @@
 	&cat		2	concatenate string
 	&cclass		1	character class (see "show-printable")
 	&chr		1	integer to char conversion
+	&cmatch		2	caseless match regular-expression value
 	&date		2	format 2nd param with 1st, like strftime.
 	&default	1	initial/default value for mode or state variable
 	&divide		2	division
@@ -2729,6 +2808,7 @@
 	&lookup		2	look for filename (see below for arguments)
 	&lower		1	lower case string
 	&lt		2	logical less than
+	&match		2	match regular-expression value
 	&middle		3	mid string(string, pos, len)
 	&modulo		2	modulus
 	&negate		1	negate
@@ -3736,9 +3816,9 @@
 	    builtin filters.
 
 	[2] Majormodes are an interesting subject in their own right, but
-	    won't be discussed much here.  For more info, refer to the help
-	    topic "Editor modes" in this help file, as well as the file
-	    doc/modes.doc .
+	    won't be discussed much within the context of syntax coloring.
+	    For more info, refer to the help topic "Majormodes" in this help
+	    file, as well as the file doc/modes.doc .
 
 	[3] Previous releases of vile utilized a syntax filtering system
 	    that actually applied color attributes to a target buffer,
@@ -3762,28 +3842,6 @@
 	   ftp://invisible-island.net/vile/ .  Note that almost all filters
 	   require preprocessing with flex (not a standard Windows tool) prior
 	   to compilation.
-	d) if you currently use the syntax coloring system that existed
-	   prior to vile version 8.3, then find and delete all instances of
-	   these files:
-
-		Non-Unix Host     Unix Host
-		-------------     ---------
-		vile.keywords     .vile.keywords
-		vile-c-filt.exe   vile-c-filt
-
-	e) if cmode is disabled, re-enable it (i.e., remove "set nocmode"
-	   from vile's startup file).  If cmode was disabled in the past
-	   because its default settings were not acceptable, be aware that
-	   this feature is configurable.  This example shows how four of
-	   cmode's parameters might be changed within vile's startup file:
-
-		define-mode c
-		~with define-submode c
-		    suffixes='\.\(\([Cchis]\)\|CC\|cc\|cpp)$'
-		    ts=4
-		    sw=4
-		    nocindent
-		~endwith
 
 	Configuration
 	-------------
@@ -3907,13 +3965,13 @@
 	    HighlightClear       ^X-Q    Clears the current buffer's color
 					 attributes.
 	    set-highlighting     <none>  Attach a major mode to a buffer
-	    			         and re-color same.  More about
+					 and re-color same.  More about
 					 this below.
 
 	For a simple go/no-go test, do:
 
 	- edit a C source file
-	- examine the editor's modeline and ensure that "cmode" is in effect
+	- examine the editor's modeline and ensure that "[cmode]" is in effect
 	- type ^X-q
 
 	If all is well, various elements of the C program will be
@@ -4101,6 +4159,160 @@
 
 
 
+Majormodes
+----------
+	Prior to studying majormodes, it helps to be familiar with the
+	"Editor modes" and "Syntax coloring" topics.
+
+	Majormodes are collections of buffer mode values that vile
+	automatically assigns to new buffers.  When the vile distribution
+	file "filters.rc" is sourced, a significant number of majormodes are
+	defined for various programming languages and file formats.  The
+	majormode assigned to a particular buffer is dependent upon two
+	criteria, in the following priority order:
+
+	1) the suffix of the file being edited, and
+	2) the file's preamble (i.e., file's first line).
+
+	Both suffix and preamble are expressed as regular expressions and
+	examples of each are readily available in filters.rc .  Speaking
+	of filters.rc, it becomes obvious from browsing this file that most
+	majormode buffer settings involve specifying appropriate regex
+	patterns for fences and comments.
+
+	The syntax for defining a new majormode or overriding an existing
+	majormode is quite rich and fully described in the file
+	doc/modes.doc .  Rather than regurgitating the contents of that
+	file here, we'll hit the high points with a couple of examples.
+
+	To define a new majormode, do this in your vile startup file:
+
+	    define-mode <new_majormode_name>
+	    ~with define-submode <new_majormode_name>
+		suffixes   "<regexp_pattern>"
+		preamble   "<if necessary>"
+		before     "<if necessary>"
+		filtername "<syntax-coloring-filter>"
+		buffer mode setting#1
+		buffer mode setting#2
+		; etc.
+	    ~endwith
+
+	For example, suppose someone wanted to edit this help file and
+	subsequently submit patches to the vile's developers.  In the spirit
+	of cooperation, the developers would appreciate changes that were
+	made with the same tabstops and tab insertion policies as used in the
+	existing help file (vile.hlp).  Taking a peek at vile.hlp, it can
+	readily be seen that physical tabs are indeed used, with stops
+	apparently set at intervals of 8.  Also, it appears that the right
+	margin is set fairly close to 80. To mirror this policy, create this
+	new majormode:
+
+	    define-mode hlp
+	    ~with define-submode hlp
+		suf '\.hlp$'
+		ts=8
+		fillcol=77
+		tabinsert
+		filtername 'vile-txt-filt'
+	    ~endwith
+
+	Now, whenever a file with suffix ".hlp" is edited, it will be colored
+	with vile-txt-filt and physical tabs inserted at multiples of 8.
+
+	To override or augment the buffer mode settings of an existing
+	majormode, do this in your startup file:
+
+	    source "filters.rc"
+	    ; ...
+	    define-mode <existing_majormode_name>
+	    ~with define-submode <existing_majormode_name>
+		changed buffer mode setting#1
+		changed buffer mode setting#2
+		; etc.
+	    ~endwith
+
+	For example, suppose it was desirable to edit all text files with
+	ignorecase disabled.  This startup file snippet will suffice:
+
+	    source "filters.rc"
+	    ; ...
+	    define-mode txt
+	    ~with define-submode txt
+		ignorecase
+	    ~endwith
+
+	Once associated, majormode submodes can be setl/unsetl just like
+	regular local buffer modes.  But note well that set/unset have no
+	effect on submodes.  So, when hlpmode is in effect, this command
+	works:
+
+	    setl notabinsert
+
+	but this command has no effect:
+
+	    set notabinsert
+
+	As added syntactic sugar, majormode submodes may be prefixed with
+	the majormode name and changed like so:
+
+	    set/setl     txt-ignorecase
+	    set/setl     hlp-fillcol=60
+	    unset/unsetl txt-ignorecase
+	    unset/unsetl hlp-tabinsert
+
+	Notes
+	-----
+	1) Use the command "show-majormodes" to display the list of majormodes
+	   and their associated submodes.
+
+	2) Only one majormode can be set for a buffer.
+
+	3) To override the majormode that vile assigns to a buffer, use
+	   either the set-highlighting macro (defined in filters.rc) or the
+	   "setl <majormode_name>" command.  Example:
+
+	    setl cppmode     ; <-- force cppmode for current buffer
+
+	cmode:  the original vile builtin majormode
+	-------------------------------------------
+	Long before Tom Dickey added majormodes to vile, there existed
+	"cmode", a feature that included its own builtin tab settings and
+	indentation style (still available today as "cindent").	 This older
+	version of cmode served as the precursor for vile's current
+	majormode system.
+
+	Today, even if filters.rc is not sourced at runtime, vile includes a
+	builtin majormode called cmode that is defined internally like so:
+
+	    define-mode c
+	    ~with define-submode c
+		ts=8
+		sw=8
+		cindent
+		cindent-chars ":#"
+		suffix "<complex_regexp_for_c_c++_file_suffixes>"
+		filtername 'vile-c-filt'
+	    ~endwith
+
+	This buitin majormode can produce some surprising results when
+	editing C source files.	 In particular:
+
+	    set ts=<val>   ; <-- has no effect, use "setl" instead
+
+	What's more these settings may be anathema for the coding style
+	in effect for a given software project.	 Override these settings
+	in the vile startup file to suit your needs/taste, like so:
+
+	    define-mode c
+	    ~with define-submode c
+		ts=4
+		sw=4
+		nocindent
+	    ~endwith
+
+
+
 Filtering "man" pages
 ---------------------
 	When used in conjunction with the vile-manfilt program (supplied as
@@ -5217,7 +5429,7 @@
 
 		:!start calc           # start the windows calculator
 
- 	Finally, it may be necessary to pass one or more flags to the shell
+	Finally, it may be necessary to pass one or more flags to the shell
 	invoked via the :sh command (e.g., force execution of a special
 	login script).  Passing such flag(s) via $shell is not a workable
 	solution.  Instead, use a macro similar to the following that
@@ -5307,7 +5519,7 @@
 			unnamed register and the clipboard.
 	"Paste"		pastes clipboard contents (if text) into current
 			buffer.
-	"Delete"   	deletes current text selection into unnamed register.
+	"Delete"	deletes current text selection into unnamed register.
 	"Select All"    selects all text in the current buffer.
 
 	The first five popup menu entries are added to the system menu (in
@@ -5587,7 +5799,6 @@
 	source vileinit.rc
 	set autoindent
 	set fillcol 75
-	set c-tabstop 4
 
 	; sitting on a brace, run the C code block through indent
 	1 store-macro
@@ -5728,7 +5939,7 @@
 	Throughout the years, Tom Dickey has contributed many code
 	improvements and features, and has stabilized vile on both VMS and
 	DOS.  After taking over official maintenance duties, Tom coded
-	winvile, added major modes, added 16-color support, and implemented
+	winvile, added majormodes, added 16-color support, and implemented
 	the majority of the current syntax coloring infrastructure.  On an
 	ongoing basis, Tom continues to fix bugs and provide the drive and
 	energy that pushes out one release of the editor after another--no
@@ -5805,4 +6016,4 @@
 
 Copyright 1995-2003 by Paul Fox, Thomas Dickey, and Kevin Buettner
 --------------------------------------------------------------------
- $Header: /usr/build/vile/vile/RCS/vile.hlp,v 1.573 2004/03/21 23:33:42 tom Exp $
+ $Header: /usr/build/vile/vile/RCS/vile.hlp,v 1.580 2004/04/11 23:43:55 tom Exp $
Index: wordmov.c
Prereq:  1.21 
--- vile-9.4e+/wordmov.c	1999-10-31 18:24:38.000000000 -0500
+++ vile-9.4f/wordmov.c	2004-04-11 19:22:31.000000000 -0400
@@ -5,370 +5,418 @@
  *	need to back up to get to the char. before the transition.
  *	Written for vile: Copyright (c) 1990, 1995-1999 by Paul Fox
  *
- * $Header: /usr/build/vile/vile/RCS/wordmov.c,v 1.21 1999/10/31 23:24:38 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/wordmov.c,v 1.22 2004/04/11 23:22:31 tom Exp $
  *
  */
 
 #include "estruct.h"
 #include "edef.h"
 
-#define WASSPACE 0
-#define ISSPACE 0
-#define WASIDENT 1
-#define ISIDENT 1
-#define WASOTHER 2
-#define ISOTHER 2
-#define WASNL 3
-#define ISNL 3
+#define WASSPACE	0
+#define ISSPACE		0
+#define WASIDENT	1
+#define ISIDENT		1
+#define WASOTHER	2
+#define ISOTHER		2
+#define WASNL		3
+#define ISNL		3
 
 static int ochartype;
 
 static int
 getchartype(void)
 {
-	register int	c;
+    int c;
 
-	if (is_at_end_of_line(DOT))
-		return (ISNL);
-	else
-		c = char_at(DOT);
-	return (isSpace(c) ? ISSPACE :
-			( isident(c) ? ISIDENT : ISOTHER ) );
+    if (is_at_end_of_line(DOT))
+	return (ISNL);
+    else
+	c = char_at(DOT);
+    return (isSpace(c) ? ISSPACE :
+	    (isident(c) ? ISIDENT : ISOTHER));
 }
 
 void
 setchartype(void)
 {
-	ochartype = getchartype();
+    ochartype = getchartype();
 }
 
-
 int
 isnewwordf(void)
 {
-	register int	ret = FALSE;
-	register int	type;
+    int ret = FALSE;
+    int type;
 
-	type = getchartype();
+    type = getchartype();
 
-	switch (ochartype) {
-	case WASNL:
-	case WASSPACE:
-		switch (type) {
-		case ISNL:
-			if (doingopcmd) {
-				ret = SORTOFTRUE;
-				break;
-			}
-			/* FALLTHROUGH */
-		case ISSPACE:
-			ret = FALSE;
-			break;
-		case ISIDENT:
-			/* FALLTHROUGH */
-		case ISOTHER:
-			ret = TRUE;
-			break;
-		}
-		break;
-	case WASIDENT:
-	case WASOTHER:
-		switch (type) {
-		case ISNL:
-			if (doingopcmd) {
-				ret = SORTOFTRUE;
-				break;
-			}
-			/* FALLTHROUGH */
-		case ISSPACE:
-			if (doingopcmd && opcmd != OPDEL) {
-				ret = SORTOFTRUE;
-				break;
-			}
-			/* FALLTHROUGH */
-		case ISIDENT:
-			/* FALLTHROUGH */
-		case ISOTHER:
-			ret = FALSE;
-			break;
-		}
-		break;
+    switch (ochartype) {
+    case WASNL:
+    case WASSPACE:
+	switch (type) {
+	case ISNL:
+	    if (doingopcmd) {
+		ret = SORTOFTRUE;
+		break;
+	    }
+	    /* FALLTHROUGH */
+	case ISSPACE:
+	    ret = FALSE;
+	    break;
+	case ISIDENT:
+	    /* FALLTHROUGH */
+	case ISOTHER:
+	    ret = TRUE;
+	    break;
+	}
+	break;
+    case WASIDENT:
+    case WASOTHER:
+	switch (type) {
+	case ISNL:
+	    if (doingopcmd) {
+		ret = SORTOFTRUE;
+		break;
+	    }
+	    /* FALLTHROUGH */
+	case ISSPACE:
+	    if (doingopcmd && opcmd != OPDEL) {
+		ret = SORTOFTRUE;
+		break;
+	    }
+	    /* FALLTHROUGH */
+	case ISIDENT:
+	    /* FALLTHROUGH */
+	case ISOTHER:
+	    ret = FALSE;
+	    break;
 	}
-	ochartype = type;
-	return (ret);
+	break;
+    }
+    ochartype = type;
+    return (ret);
 }
 
 int
 isnewwordb(void)
 {
-	register int	ret = FALSE;
-	register int	type;
+    int ret = FALSE;
+    int type;
 
-	type = getchartype();
+    type = getchartype();
 
-	switch (ochartype) {
-	case WASNL:
-	case WASSPACE:
-		ret = FALSE;	break;
-	case WASIDENT:
-		switch (type) {
-		case ISNL:
-		case ISSPACE: ret = TRUE;	break;
-		case ISIDENT:
-		case ISOTHER: ret = FALSE;	break;
-		}
-		break;
-	case WASOTHER:
-		switch (type) {
-		case ISNL:
-		case ISSPACE: ret = TRUE;	break;
-		case ISIDENT:
-		case ISOTHER: ret = FALSE;	break;
-		}
-		break;
+    switch (ochartype) {
+    case WASNL:
+    case WASSPACE:
+	ret = FALSE;
+	break;
+    case WASIDENT:
+	switch (type) {
+	case ISNL:
+	case ISSPACE:
+	    ret = TRUE;
+	    break;
+	case ISIDENT:
+	case ISOTHER:
+	    ret = FALSE;
+	    break;
+	}
+	break;
+    case WASOTHER:
+	switch (type) {
+	case ISNL:
+	case ISSPACE:
+	    ret = TRUE;
+	    break;
+	case ISIDENT:
+	case ISOTHER:
+	    ret = FALSE;
+	    break;
 	}
-	ochartype = type;
-	return (ret);
+	break;
+    }
+    ochartype = type;
+    return (ret);
 }
 
 int
 isnewviwordf(void)
 {
-	register int	ret = FALSE;
-	register int	type;
+    int ret = FALSE;
+    int type;
 
-	type = getchartype();
+    type = getchartype();
 
-	switch (ochartype) {
-	case WASNL:
-	case WASSPACE:
-		switch (type) {
-		case ISNL:
-			if (doingopcmd) {
-				ret = SORTOFTRUE;
-				break;
-			}
-			/* FALLTHROUGH */
-		case ISSPACE:
-			ret = FALSE;
-			break;
-		case ISIDENT:
-			/* FALLTHROUGH */
-		case ISOTHER:
-			ret = TRUE;
-			break;
-		}
-		break;
-	case WASIDENT:
-		switch (type) {
-		case ISNL:
-			if (doingopcmd) {
-				ret = SORTOFTRUE;
-				break;
-			}
-			/* FALLTHROUGH */
-		case ISSPACE:
-			if (doingopcmd && opcmd != OPDEL) {
-				ret = SORTOFTRUE;
-				break;
-			}
-			/* FALLTHROUGH */
-		case ISIDENT:
-			ret = FALSE;
-			break;
-		case ISOTHER:
-			ret = TRUE;
-			break;
-		}
-		break;
-	case WASOTHER:
-		switch (type) {
-		case ISNL:
-			if (doingopcmd) {
-				ret = SORTOFTRUE;
-				break;
-			}
-			/* FALLTHROUGH */
-		case ISSPACE:
-			if (doingopcmd && opcmd != OPDEL) {
-				ret = SORTOFTRUE;
-				break;
-			}
-			/* FALLTHROUGH */
-		case ISOTHER:
-			ret = FALSE;
-			break;
-		case ISIDENT:
-			ret = TRUE;
-			break;
-		}
-		break;
+    switch (ochartype) {
+    case WASNL:
+    case WASSPACE:
+	switch (type) {
+	case ISNL:
+	    if (doingopcmd) {
+		ret = SORTOFTRUE;
+		break;
+	    }
+	    /* FALLTHROUGH */
+	case ISSPACE:
+	    ret = FALSE;
+	    break;
+	case ISIDENT:
+	    /* FALLTHROUGH */
+	case ISOTHER:
+	    ret = TRUE;
+	    break;
 	}
-	ochartype = type;
-	return (ret);
+	break;
+    case WASIDENT:
+	switch (type) {
+	case ISNL:
+	    if (doingopcmd) {
+		ret = SORTOFTRUE;
+		break;
+	    }
+	    /* FALLTHROUGH */
+	case ISSPACE:
+	    if (doingopcmd && opcmd != OPDEL) {
+		ret = SORTOFTRUE;
+		break;
+	    }
+	    /* FALLTHROUGH */
+	case ISIDENT:
+	    ret = FALSE;
+	    break;
+	case ISOTHER:
+	    ret = TRUE;
+	    break;
+	}
+	break;
+    case WASOTHER:
+	switch (type) {
+	case ISNL:
+	    if (doingopcmd) {
+		ret = SORTOFTRUE;
+		break;
+	    }
+	    /* FALLTHROUGH */
+	case ISSPACE:
+	    if (doingopcmd && opcmd != OPDEL) {
+		ret = SORTOFTRUE;
+		break;
+	    }
+	    /* FALLTHROUGH */
+	case ISOTHER:
+	    ret = FALSE;
+	    break;
+	case ISIDENT:
+	    ret = TRUE;
+	    break;
+	}
+	break;
+    }
+    ochartype = type;
+    return (ret);
 }
 
 int
 isnewviwordb(void)
 {
-	register int	ret = FALSE;
-	register int	type;
+    int ret = FALSE;
+    int type;
 
-	type = getchartype();
+    type = getchartype();
 
-	switch (ochartype) {
-	case WASNL:
-	case WASSPACE:
-		ret = FALSE;	break;
-	case WASIDENT:
-		switch (type) {
-		case ISNL:
-		case ISSPACE:
-		case ISOTHER: ret = TRUE;	break;
-		case ISIDENT: ret = FALSE;	break;
-		}
-		break;
-	case WASOTHER:
-		switch (type) {
-		case ISNL:
-		case ISSPACE:
-		case ISIDENT: ret = TRUE;	break;
-		case ISOTHER: ret = FALSE;	break;
-		}
-		break;
+    switch (ochartype) {
+    case WASNL:
+    case WASSPACE:
+	ret = FALSE;
+	break;
+    case WASIDENT:
+	switch (type) {
+	case ISNL:
+	case ISSPACE:
+	case ISOTHER:
+	    ret = TRUE;
+	    break;
+	case ISIDENT:
+	    ret = FALSE;
+	    break;
+	}
+	break;
+    case WASOTHER:
+	switch (type) {
+	case ISNL:
+	case ISSPACE:
+	case ISIDENT:
+	    ret = TRUE;
+	    break;
+	case ISOTHER:
+	    ret = FALSE;
+	    break;
 	}
-	ochartype = type;
-	return (ret);
+	break;
+    }
+    ochartype = type;
+    return (ret);
 }
 
 int
 isendwordf(void)
 {
-	register int	ret = FALSE;
-	register int	type;
+    int ret = FALSE;
+    int type;
 
-	type = getchartype();
+    type = getchartype();
 
-	switch (ochartype) {
-	case WASNL:
-	case WASSPACE:
-		ret = FALSE;	break;
-	case WASIDENT:
-		switch (type) {
-		case ISNL:
-		case ISSPACE:
-			if (doingopcmd) ret = SORTOFTRUE;
-			else ret = TRUE;
-			if (doingsweep) sweephack = TRUE;
-			break;
-		case ISIDENT:
-		case ISOTHER: ret = FALSE;	break;
-		}
-		break;
-	case WASOTHER:
-		switch (type) {
-		case ISNL:
-		case ISSPACE:
-			if (doingopcmd) ret = SORTOFTRUE;
-			else ret = TRUE;
-			if (doingsweep) sweephack = TRUE;
-			break;
-		case ISIDENT:
-		case ISOTHER: ret = FALSE;	break;
-		}
-		break;
+    switch (ochartype) {
+    case WASNL:
+    case WASSPACE:
+	ret = FALSE;
+	break;
+    case WASIDENT:
+	switch (type) {
+	case ISNL:
+	case ISSPACE:
+	    if (doingopcmd)
+		ret = SORTOFTRUE;
+	    else
+		ret = TRUE;
+	    if (doingsweep)
+		sweephack = TRUE;
+	    break;
+	case ISIDENT:
+	case ISOTHER:
+	    ret = FALSE;
+	    break;
 	}
-	ochartype = type;
-	return (ret);
+	break;
+    case WASOTHER:
+	switch (type) {
+	case ISNL:
+	case ISSPACE:
+	    if (doingopcmd)
+		ret = SORTOFTRUE;
+	    else
+		ret = TRUE;
+	    if (doingsweep)
+		sweephack = TRUE;
+	    break;
+	case ISIDENT:
+	case ISOTHER:
+	    ret = FALSE;
+	    break;
+	}
+	break;
+    }
+    ochartype = type;
+    return (ret);
 }
 
 int
 isendviwordf(void)
 {
-	register int	ret = FALSE;
-	register int	type;
+    int ret = FALSE;
+    int type;
 
-	type = getchartype();
+    type = getchartype();
 
-	switch (ochartype) {
-	case WASNL:
-	case WASSPACE:
-		ret = FALSE;	break;
-	case WASIDENT:
-		switch (type) {
-		case ISNL:
-		case ISSPACE:
-		case ISOTHER:
-			if (doingopcmd) ret = SORTOFTRUE;
-			else ret = TRUE;
-			if (doingsweep) sweephack = TRUE;
-			break;
-		case ISIDENT: ret = FALSE;	break;
-		}
-		break;
-	case WASOTHER:
-		switch (type) {
-		case ISNL:
-		case ISSPACE:
-		case ISIDENT:
-			if (doingopcmd) ret = SORTOFTRUE;
-			else ret = TRUE;
-			if (doingsweep) sweephack = TRUE;
-			break;
-		case ISOTHER: ret = FALSE;	break;
-		}
-		break;
+    switch (ochartype) {
+    case WASNL:
+    case WASSPACE:
+	ret = FALSE;
+	break;
+    case WASIDENT:
+	switch (type) {
+	case ISNL:
+	case ISSPACE:
+	case ISOTHER:
+	    if (doingopcmd)
+		ret = SORTOFTRUE;
+	    else
+		ret = TRUE;
+	    if (doingsweep)
+		sweephack = TRUE;
+	    break;
+	case ISIDENT:
+	    ret = FALSE;
+	    break;
 	}
-	ochartype = type;
-	return (ret);
+	break;
+    case WASOTHER:
+	switch (type) {
+	case ISNL:
+	case ISSPACE:
+	case ISIDENT:
+	    if (doingopcmd)
+		ret = SORTOFTRUE;
+	    else
+		ret = TRUE;
+	    if (doingsweep)
+		sweephack = TRUE;
+	    break;
+	case ISOTHER:
+	    ret = FALSE;
+	    break;
+	}
+	break;
+    }
+    ochartype = type;
+    return (ret);
 }
 
 #ifdef template
 int
 isANYTHING(void)
 {
-	register int	ret = FALSE;
-	register int	type;
+    int ret = FALSE;
+    int type;
 
-	type = getchartype();
+    type = getchartype();
 
-	switch (ochartype) {
-	case WASNL:
-	case WASSPACE:
-		switch (type) {
-		case ISNL:
-		case ISSPACE:
-			ret = FALSE;	break;
-		case ISIDENT:
-			ret = FALSE;	break;
-		case ISOTHER:
-			ret = FALSE;	break;
-		}
-		break;
-	case WASIDENT:
-		switch (type) {
-		case ISNL:
-		case ISSPACE:
-			ret = TRUE;	break;
-		case ISIDENT:
-			ret = FALSE;	break;
-		case ISOTHER:
-			ret = TRUE;	break;
-		}
-		break;
-	case WASOTHER:
-		switch (type) {
-		case ISNL:
-		case ISSPACE:
-			ret = TRUE;	break;
-		case ISIDENT:
-			ret = TRUE;	break;
-		case ISOTHER:
-			ret = FALSE;	break;
-		}
-		break;
+    switch (ochartype) {
+    case WASNL:
+    case WASSPACE:
+	switch (type) {
+	case ISNL:
+	case ISSPACE:
+	    ret = FALSE;
+	    break;
+	case ISIDENT:
+	    ret = FALSE;
+	    break;
+	case ISOTHER:
+	    ret = FALSE;
+	    break;
+	}
+	break;
+    case WASIDENT:
+	switch (type) {
+	case ISNL:
+	case ISSPACE:
+	    ret = TRUE;
+	    break;
+	case ISIDENT:
+	    ret = FALSE;
+	    break;
+	case ISOTHER:
+	    ret = TRUE;
+	    break;
+	}
+	break;
+    case WASOTHER:
+	switch (type) {
+	case ISNL:
+	case ISSPACE:
+	    ret = TRUE;
+	    break;
+	case ISIDENT:
+	    ret = TRUE;
+	    break;
+	case ISOTHER:
+	    ret = FALSE;
+	    break;
 	}
-	ochartype = type;
-	return (ret);
+	break;
+    }
+    ochartype = type;
+    return (ret);
 }
 #endif /* template */