# vile 9.4a - 2003/10/8 - T.Dickey <dickey@his.com>
# ------------------------------------------------------------------------------
# CHANGES                    |   38 +
# MANIFEST                   |    3 
# aclocal.m4                 |   27 -
# config.guess               |   23 
# config.sub                 |   44 +
# doc/indent.pro             |    7 
# doc/menus.doc              |   12 
# estruct.h                  |   14 
# filters/filters.rc         |   15 
# filters/fltstack.h         |    8 
# filters/lispfilt.l         |   75 ++-
# filters/sh-filt.l          |    6 
# macros/which.rc            |   82 +++
# main.c                     |    6 
# makefile.djg               |    8 
# menu.c                     |    6 
# patchlev.h                 |    2 
# revlist                    |   37 -
# vile-9.4.spec              |    9 
# vile-9.4a/filters/lisp.key | 1026 +++++++++++++++++++++++++++++++++++++++++++
# x11.c                      |   12 
# 21 files changed, 1363 insertions(+), 97 deletions(-)
# ------------------------------------------------------------------------------
Index: CHANGES
--- vile-9.4+/CHANGES	2003-08-04 18:41:29.000000000 -0400
+++ vile-9.4a/CHANGES	2003-10-08 20:33:41.000000000 -0400
@@ -1,3 +1,41 @@
+Changes for vile 9.5 (released ??? ??? ?? ????)
+
+ 20031008 (a)
+	> Daniel L Ashbrook:
+	+ add lispmode, to use vile-lisp-filt.
+	> Mark Robinson:
+	+ add cygwin to OPT_CASELESS
+	+ modify xvile's wheelScrollAmount resource to scroll by pages if the
+	  resource value is negative.
+ 	> Tom Dickey:
+	+ correct suffix pattern for xresmode, which did not match ".Xdefaults"
+	  (see 9.2p).
+	+ add macro "which-menu" to which.rc, which shows the locations that
+	  xvile checks for a menu-file.
+	+ revise lookup for xvile's menu file to look for dotnames in the
+	  current and home-directories, while non-dotnames may be found there
+	  and in $HOME/.vile and on $startup-path.  Combine this with changing
+	  the default for $menu-file back to ".vilemenu" as documented rather
+	  than "vilemenu.rc".  The latter name is used in the non-dotname
+	  locations if $menu-file is a dot-name (report by Alf Pearce noted
+	  that the default for $menu-file no longer matched the documented
+	  ".vilemenu").
+	+ change order of charinit() and global_val_init() so that mkupper()
+	  works, e.g., for use in computing the value of $XVILE_MENU (report by
+	  Alf Pearce <alfp@unimelb.edu.au> noted that the environment variable
+	  did not work).
+	+ improve lisp syntax highlighting (reports by Daniel L Ashbrook,
+	  used the HyperSpec for reference):
+	  + recognize "#|"..."|#" comments.
+	  + revise patterns for numbers.
+	  + allow decimal digits embedded in identifiers
+	+ change makefile.djg to use zip rather than pkzip, and go32-v2.exe
+	  rather than go32.exe
+	+ improve configure check for <term.h>, which may be <ncursesw/term.h>.
+	+ correct highlighting of sh construct
+		${#variable}
+	  (report by Michael Finken).
+
 Changes for vile 9.4 (released Mon Aug 04 2003)
 
  20030727 (v)
Index: MANIFEST
--- vile-9.4+/MANIFEST	2003-08-04 20:38:23.000000000 -0400
+++ vile-9.4a/MANIFEST	2003-10-08 20:50:33.000000000 -0400
@@ -1,4 +1,4 @@
-MANIFEST for vile, version v9_4
+MANIFEST for vile, version v9_4a
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 CHANGES                         Change-log for VILE
@@ -214,6 +214,7 @@
 filters/latexflt.l              LaTeX syntax filter for vile
 filters/lex-filt.l              lex syntax filter for vile
 filters/lex.key                 keywords for lex + c
+filters/lisp.key                keywords for lispmode
 filters/lispfilt.l              syntax filter for lisp
 filters/m4-filt.c               syntax filter for M4
 filters/m4.key                  keywords for M4 syntax filter
Index: aclocal.m4
Prereq:  1.125 
--- vile-9.4+/aclocal.m4	2003-05-24 11:05:47.000000000 -0400
+++ vile-9.4a/aclocal.m4	2003-09-16 20:46:07.000000000 -0400
@@ -1,6 +1,6 @@
 dnl Local definitions for autoconf.
 dnl
-dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.125 2003/05/24 15:05:47 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.126 2003/09/17 00:46:07 tom Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
@@ -429,7 +429,7 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CPPFLAGS version: 6 updated: 2002/10/27 18:21:42
+dnl CF_CURSES_CPPFLAGS version: 7 updated: 2003/06/06 00:48:41
 dnl ------------------
 dnl Look for the curses headers.
 AC_DEFUN([CF_CURSES_CPPFLAGS],[
@@ -448,7 +448,7 @@
 	;;
 esac
 ])
-test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
+test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
 AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
 cf_cv_ncurses_header=none
@@ -656,7 +656,7 @@
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 4 updated: 2002/01/12 17:08:23
+dnl CF_CURSES_TERM_H version: 5 updated: 2003/08/20 15:23:08
 dnl ----------------
 dnl SVr4 curses should have term.h as well (where it puts the definitions of
 dnl the low-level interface).  This may not be true in old/broken implementations,
@@ -665,15 +665,19 @@
 AC_DEFUN([CF_CURSES_TERM_H],
 [
 AC_CACHE_CHECK(for term.h, cf_cv_term_header,[
+
+# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
+# for <term.h> if we do not find the variant.
 for cf_header in \
-	ncurses/term.h \
+	`echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \
 	term.h
 do
 	AC_TRY_COMPILE([
 #include <${cf_cv_ncurses_header-curses.h}>
 #include <${cf_header}>],
 	[WINDOW *x],
-	[cf_cv_term_header=$cf_header],
+	[cf_cv_term_header=$cf_header
+	 break],
 	[cf_cv_term_header=no])
 done
 ])
@@ -685,6 +689,9 @@
 ncurses/term.h)
 	AC_DEFINE(HAVE_NCURSES_TERM_H)
 	;;
+ncursesw/term.h)
+	AC_DEFINE(HAVE_NCURSESW_TERM_H)
+	;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -904,7 +911,7 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_VERSION version: 2 updated: 2003/05/24 15:01:41
+dnl CF_GCC_VERSION version: 3 updated: 2003/09/06 19:16:57
 dnl --------------
 dnl Find version of gcc
 AC_DEFUN([CF_GCC_VERSION],[
@@ -912,13 +919,13 @@
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 	AC_MSG_CHECKING(version of $CC)
-	GCC_VERSION="`${CC} --version|head -1 | sed -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+	GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
 	AC_MSG_RESULT($GCC_VERSION)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 14 updated: 2003/05/24 15:03:15
+dnl CF_GCC_WARNINGS version: 15 updated: 2003/07/05 18:42:30
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
@@ -933,7 +940,7 @@
 AC_DEFUN([CF_GCC_WARNINGS],
 [
 AC_REQUIRE([CF_GCC_VERSION])
-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes
 then
 	cat > conftest.$ac_ext <<EOF
 #line __oline__ "configure"
Index: config.guess
--- vile-9.4+/config.guess	2003-05-22 07:33:47.000000000 -0400
+++ vile-9.4a/config.guess	2003-07-12 15:09:50.000000000 -0400
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-05-22'
+timestamp='2003-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,6 +106,7 @@
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 dummy=$tmp/dummy ;
 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
@@ -282,6 +283,9 @@
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
+	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -730,7 +734,7 @@
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
 	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -759,7 +763,10 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -770,8 +777,8 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:3*)
-	echo i586-pc-interix3
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -881,6 +888,9 @@
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -1195,6 +1205,9 @@
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
Index: config.sub
--- vile-9.4+/config.sub	2003-06-02 08:53:32.000000000 -0400
+++ vile-9.4a/config.sub	2003-07-12 15:10:05.000000000 -0400
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-05-24'
+timestamp='2003-07-04'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,7 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -229,7 +229,7 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| clipper \
+	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
@@ -261,7 +261,7 @@
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic80 | tron \
+	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale | xstormy16 | xtensa \
@@ -280,8 +280,8 @@
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
-		basic_machine=$basic_machine-pc
-		;;
+	  basic_machine=$basic_machine-pc
+	  ;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -771,18 +771,24 @@
 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
@@ -841,6 +847,10 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -848,6 +858,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -922,10 +935,6 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic4x | c4x*)
-		basic_machine=tic4x-unknown
-		os=-coff
-		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
@@ -1090,8 +1099,8 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
+        # First match some system type aliases
+        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1119,7 +1128,7 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
@@ -1131,7 +1140,7 @@
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1277,6 +1286,9 @@
 	arm*-semi)
 		os=-aout
 		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
Index: doc/indent.pro
--- vile-9.4+/doc/indent.pro	2000-08-09 05:46:33.000000000 -0400
+++ vile-9.4a/doc/indent.pro	2003-01-04 11:31:15.000000000 -0500
@@ -12,7 +12,7 @@
 -nbad
 /* format braces inline */
 -br
-/* line up parentheses */
+/* do not line up parentheses */
 -lp
 /* put the type of a procedure on the line before its name */
 -psl
@@ -28,7 +28,12 @@
 -ss
 
 /* for vile */
+-T chtype
 -T size_t
+-T FILE
+-T MARK
 -T LINE
 -T BUFFER
 -T WINDOW
+-T GCC_NORETURN
+-T RETSIGTYPE 
Index: doc/menus.doc
Prereq:  1.6 
--- vile-9.4+/doc/menus.doc	1999-12-17 20:17:15.000000000 -0500
+++ vile-9.4a/doc/menus.doc	2003-10-08 20:37:21.000000000 -0400
@@ -1,4 +1,4 @@
--- $Header: /usr/build/vile/vile/doc/RCS/menus.doc,v 1.6 1999/12/18 01:17:15 tom Exp $
+-- $Header: /usr/build/vile/vile/doc/RCS/menus.doc,v 1.7 2003/10/09 00:37:21 tom Exp $
 -- adapted from description by Philippe Chassany (20/02/1997)
 -- e-mail: phil@cln46ks.der.edf.fr
 
@@ -6,8 +6,12 @@
 The Motif and Athena widget versions of xvile automatically support user
 configurable menus.
 
-If the environment variable XVILE_MENU is set, it contains the name of
-the rc file.  Otherwise, the name ".vilemenu" is used.
+If the environment variable XVILE_MENU is set, it contains the name of the rc
+file.  Otherwise, the name ".vilemenu" is used.  The name of the menu file is
+given in the variable "$menu-file".  If it is not found, and is different from
+"vilemenu.rc", xvile looks for that file in the list of directories given in
+"$startup-path".  The "vilemenu.rc" file is treated specially because it is the
+file installed from vile's distribution.
 
 The file contains a series of lines whose first character denotes the
 type of entry, subsequent fields delimited by colon:
@@ -27,7 +31,7 @@
 		edit_rc - switch to a buffer with ".vilerc".
 		parse_rc - source ".vilerc"
 		edit_mrc - switch to a buffer with the menu rc file
-			".vilemenu"
+			which was found, e.g., "$menu-file" or "vilemenu.rc".
 
 	S - separator
 
Index: estruct.h
Prereq:  1.536 
--- vile-9.4+/estruct.h	2003-06-30 20:32:51.000000000 -0400
+++ vile-9.4a/estruct.h	2003-10-08 20:02:33.000000000 -0400
@@ -12,7 +12,7 @@
 */
 
 /*
- * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.536 2003/07/01 00:32:51 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.537 2003/10/09 00:02:33 tom Exp $
  */
 
 #ifndef _estruct_h
@@ -85,6 +85,10 @@
 # define SYS_SUNOS 1		/* FIXME: need to tweak lint ifdefs */
 #endif
 
+#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+# define SYS_CYGWIN 1
+#endif
+
 #ifdef __EMX__
 # define SYS_OS2_EMX 1		/* makefile.emx, or configure-script */
 #endif
@@ -122,6 +126,10 @@
 #define CC_WATCOM		0	/* WATCOM C/386 version 9.0 or above */
 #endif
 
+#ifndef SYS_CYGWIN
+#define SYS_CYGWIN	     	0       /* Unix'ed Win32                */
+#endif
+
 #ifndef SYS_MSDOS
 #define SYS_MSDOS       	0       /* MS-DOS                       */
 #endif
@@ -553,7 +561,7 @@
 
 /* systems with MSDOS-like filename syntax */
 #define OPT_MSDOS_PATH  (SYS_MSDOS || SYS_OS2 || SYS_WINNT || SYS_OS2_EMX)
-#define OPT_CASELESS	(SYS_MSDOS || SYS_OS2 || SYS_WINNT || SYS_OS2_EMX || SYS_VMS)
+#define OPT_CASELESS	(SYS_MSDOS || SYS_OS2 || SYS_WINNT || SYS_OS2_EMX || SYS_CYGWIN || SYS_VMS)
 #define OPT_UNC_PATH	(SYS_WINNT)
 
 /* individual features that are (normally) controlled by SMALLER */
@@ -780,7 +788,7 @@
 
 /* on MS-DOS we have to open files in binary mode to see the ^Z characters. */
 
-#if SYS_MSDOS || SYS_OS2 || SYS_WINNT || defined(__CYGWIN32__) || defined(__CYGWIN__) || defined(__EMX__)
+#if SYS_MSDOS || SYS_OS2 || SYS_WINNT || SYS_CYGWIN || SYS_OS2_EMX
 #define FOPEN_READ	"rb"
 #define FOPEN_WRITE	"wb"
 #define FOPEN_APPEND	"ab"
Index: filters/filters.rc
Prereq:  1.174 
--- vile-9.4+/filters/filters.rc	2003-07-27 11:35:18.000000000 -0400
+++ vile-9.4a/filters/filters.rc	2003-10-08 16:45:25.000000000 -0400
@@ -1,4 +1,4 @@
-; $Id: filters.rc,v 1.174 2003/07/27 15:35:18 tom Exp $
+; $Id: filters.rc,v 1.176 2003/10/08 20:45:25 tom Exp $
 ; majormodes in this file are ordered alphabetically for convenience - the
 ; precedence used by vile is strictly alphabetic, counting case.
 
@@ -267,6 +267,15 @@
 	cindent-chars &cat ':#' $fences
 ~endwith
 
+define-mode lisp
+~with define-submode lisp
+	suf '\.\(lisp\|lsp\)$'
+	fence-pairs='()'
+	fence-begin='#|'
+	fence-end='|#'
+	comment-prefix ';'
+~endwith
+
 define-mode log
 ~with define-submode log
 	suf '\(\(run\|make\)\.out\|\.log[^/]*\)$'
@@ -654,9 +663,9 @@
 define-mode xres
 ~with define-submode xres
 	~if $filename-ic
-		suf '\(\.Xdefaults\|\.ad\)$'
+		suf '\(\.Xdefaults\(-[^/]\+$\)\?\|\.ad\)$'
 	~else
-		suf '\(app-defaults/[A-Z]\?[A-Z][a-z0-9-]\+\|\.Xdefaults\(-[^/]\+$\)\|\.ad\)$'
+		suf '\(app-defaults/[A-Z]\?[A-Z][a-z0-9-]\+\|\.Xdefaults\(-[^/]\+$\)\?\|\.ad\)$'
 	~endif
 	comment-prefix	'^\s*!'
 	comments	'^\s*!\s*$'
Index: filters/fltstack.h
Prereq:  1.7 
--- vile-9.4+/filters/fltstack.h	2003-05-20 15:19:57.000000000 -0400
+++ vile-9.4a/filters/fltstack.h	2003-09-17 17:00:55.000000000 -0400
@@ -1,16 +1,20 @@
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/fltstack.h,v 1.7 2003/05/20 19:19:57 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/fltstack.h,v 1.8 2003/09/17 21:00:55 tom Exp $
  * A simple stack for lex states
  */
 typedef struct {
     int state;
+#ifdef FLTSTACK_EXTRA
+    FLTSTACK_EXTRA
+#endif
 } STACK;
 static STACK *stk_state = 0;
 
 static int stk_limit = 0;
 static int stk_level = -1;
 
-#define FLT_STATE stk_state[stk_level].state
+#define FLTSTACK_THIS stk_state[stk_level]
+#define FLT_STATE     FLTSTACK_THIS.state
 
 /*
  * Record the given state at the current stack level, and tell lex about it.
Index: filters/lisp.key
--- /dev/null	2003-09-09 19:35:02.000000000 -0400
+++ vile-9.4a/filters/lisp.key	2003-09-17 18:21:59.000000000 -0400
@@ -0,0 +1,1026 @@
+: $Id: lisp.key,v 1.2 2003/09/17 22:21:59 tom Exp $
+.equals ;
+; turn off abbreviations, allow using '*' in identifiers
+.abbrev ;
+;
+;constants
+;
+array-dimension-limit
+array-rank-limit
+array-total-size-limit
+call-arguments-limit
+char-bits-limit
+char-code-limit
+char-control-bit
+char-font-limit
+char-hyper-bit
+char-meta-bit
+char-super-bit
+double-float-epsilon
+double-float-negative-epsilon
+internal-time-units-per-second
+lambda-list-keywords
+lambda-parameters-limit
+least-negative-double-float
+least-negative-long-float
+least-negative-normalized-double-float
+least-negative-normalized-long-float
+least-negative-normalized-short-float
+least-negative-normalized-single-float
+least-negative-short-float
+least-negative-single-float
+least-positive-double-float
+least-positive-long-float
+least-positive-normalized-double-float
+least-positive-normalized-long-float
+least-positive-normalized-short-float
+least-positive-normalized-single-float
+least-positive-short-float
+least-positive-single-float
+long-float-epsilon
+long-float-negative-epsilon
+most-negative-double-float
+most-negative-fixnum
+most-negative-long-float
+most-negative-short-float
+most-negative-single-float
+most-positive-double-float
+most-positive-fixnum
+most-positive-long-float
+most-positive-short-float
+most-positive-single-float
+multiple-values-limit
+nil
+pi
+short-float-epsilon
+short-float-negative-epsilon
+single-float-epsilon
+single-float-negative-epsilon
+t
+;
+;declaration
+;
+off-line-port
+optimizable-series-function
+propagate-alterability
+;
+;functions
+;
+*
++
+-
+/
+1+
+1-
+<
+<=
+=
+>=
+>
+abort
+abs
+acons
+acos
+acosh
+adjoin
+adjust-array
+adjustable-array-p
+alpha-char-p
+alphanumericp
+alter
+append
+apply
+applyhook
+apropos
+apropos-list
+aref
+arithmetic-error-operands
+arithmetic-error-operation
+array-dimension
+array-dimensions
+array-element-type
+array-has-fill-pointer-p
+array-in-bounds-p
+array-rank
+array-row-major-index
+array-total-size
+arrayp
+ash
+asin
+asinh
+assoc
+assoc-if
+assoc-if-not
+atan
+atanh
+atom
+augment-environment
+bit
+bit-and
+bit-andc1
+bit-andc2
+bit-eqv
+bit-ior
+bit-nand
+bit-nor
+bit-not
+bit-orc1
+bit-orc2
+bit-vector-p
+bit-xor
+boole
+both-case-p
+boundp
+break
+break
+broadcast-stream-streams
+butlast
+byte
+byte-position
+byte-size
+caaaar
+caaadr
+caaar
+caadar
+caaddr
+caadr
+caar
+cadaar
+cadadr
+cadar
+caddar
+cadddr
+caddr
+cadr
+call-next-method
+car
+catenate
+cdaaar
+cdaadr
+cdaar
+cdadar
+cdaddr
+cdadr
+cdar
+cddaar
+cddadr
+cddar
+cdddar
+cddddr
+cdddr
+cddr
+cdr
+ceiling
+cell-error-name
+cerror
+cerror
+char
+char-bit
+char-bits
+char-code
+char-downcase
+char-equal
+char-font
+char-greaterp
+char-int
+char-lessp
+char-name
+char-not-equal
+char-not-greaterp
+char-not-lessp
+char-upcase
+char/=
+char<
+char<=
+char=
+char>
+char>=
+character
+characterp
+choose
+choose-if
+chunk
+cis
+class-of
+clear-input
+close
+clrhash
+code-char
+coerce
+collect
+collect-alist
+collect-and
+collect-append
+collect-file
+collect-first
+collect-fn
+collect-hash
+collect-last
+collect-length
+collect-max
+collect-min
+collect-nconc
+collect-nth
+collect-or
+collect-plist
+collect-sum
+collecting-fn
+commonp
+compile
+compile-file
+compile-file-pathname
+compiled-function-p
+compiler-macro-function
+compiler-macroexpand
+compiler-macroexpand-1
+complement
+complex
+complexp
+compute-applicable-methods
+compute-restarts
+concatenate
+concatenated-stream-streams
+conjugate
+cons
+consp
+constantp
+continue
+copy-alist
+copy-list
+copy-pprint-dispatch
+copy-readtable
+copy-seq
+copy-symbol
+copy-tree
+cos
+cosh
+cotruncate
+count
+count-if
+count-if-not
+declaration-information
+decode-float
+decode-universal-time
+delete
+delete-duplicates
+delete-file
+delete-if
+delete-if-not
+delete-package
+denominator
+deposit-field
+describe
+digit-char
+digit-char-p
+directory
+directory-namestring
+disassemble
+documentation
+dpb
+dribble
+echo-stream-input-stream
+echo-stream-output-stream
+ed
+eighth
+elt
+enclose
+encode-universal-time
+endp
+enough-namestring
+ensure-generic-function
+eq
+eql
+equal
+equalp
+error
+error
+eval
+evalhook
+evenp
+every
+exp
+expand
+export
+expt
+fboundp
+fdefinition
+ffloor
+fifth
+file-author
+file-error-pathname
+file-length
+file-namestring
+file-position
+file-string-length
+file-write-date
+fill
+fill-pointer
+find
+find-all-symbols
+find-class
+find-if
+find-if-not
+find-package
+find-restart
+find-symbol
+finish-output
+first
+float
+float-digits
+float-precision
+float-radix
+float-sign
+floatp
+floor
+format
+fourth
+funcall
+function-information
+function-lambda-expression
+functionp
+gatherer
+gcd
+generator
+gensym
+gentemp
+get
+get-decoded-time
+get-internal-real-time
+get-internal-run-time
+get-output-stream-string
+get-properties
+get-setf-method
+get-setf-method-multiple-value
+get-universal-time
+getf
+gethash
+graphic-char-p
+hash-table-count
+hash-table-p
+hash-table-rehash-size
+hash-table-rehash-threshold
+hash-table-size
+hash-table-test
+host-namestring
+identity
+imagpart
+import
+in-package
+input-stream-p
+inspect
+int-char
+integer-decode-float
+integer-length
+integerp
+interactive-stream-p
+intern
+intersection
+invalid-method-error
+invoke-debugger
+invoke-restart
+isqrt
+keywordp
+last
+latch
+lcm
+ldb
+ldb-test
+ldiff
+length
+lisp-implementation-type
+lisp-implementation-version
+list
+list*
+list-all-packages
+list-length
+listen
+listp
+load
+load-logical-pathname-translations
+log
+logand
+logandc1
+logandc2
+logbitp
+logcount
+logeqv
+logical-pathname
+logical-pathname-translations
+logior
+lognand
+lognor
+lognot
+logorc1
+logorc2
+logtest
+logxor
+long-site-name
+lower-case-p
+machine-instance
+machine-type
+machine-version
+macro-function
+macroexpand
+macroexpand-1
+make-array
+make-broadcast-stream
+make-char
+make-concatenated-stream
+make-condition
+make-dispatch-macro-character
+make-echo-stream
+make-hash-table
+make-list
+make-load-form-saving-slots
+make-package
+make-pathname
+make-random-state
+make-sequence
+make-string
+make-string-input-stream
+make-string-output-stream
+make-symbol
+make-synonym-stream
+make-two-way-stream
+makunbound
+map
+map-fn
+map-into
+mapc
+mapcan
+mapcar
+mapcon
+maphash
+mapl
+maplist
+mask
+mask-field
+max
+member
+member-if
+member-if-not
+merge
+merge-pathnames
+method-combination-error
+min
+mingle
+minusp
+mismatch
+mod
+muffle-warning
+name-char
+namestring
+nbutlast
+nconc
+next-method-p
+next-out
+nintersection
+ninth
+not
+notany
+notevery
+nreconc
+nreverse
+nset-difference
+nset-exclusive-or
+nstring-capitalize
+nstring-downcase
+nstring-upcase
+nsublis
+nsubst
+nsubst-if
+nsubst-if-not
+nsubstitute
+nsubstitute-if
+nsubstitute-if-not
+nth
+nthcdr
+null
+numberp
+numerator
+nunion
+oddp
+open
+open-stream-p
+output-stream-p
+package-error-package
+package-name
+package-nicknames
+package-shadowing-symbols
+package-use-list
+package-used-by-list
+packagep
+pairlis
+parse-integer
+parse-macro
+parse-namestring
+pathname
+pathname-device
+pathname-directory
+pathname-host
+pathname-match-p
+pathname-name
+pathname-type
+pathname-version
+pathnamep
+peek-char
+phase
+plusp
+position
+position-if
+position-if-not
+positions
+pprint-dispatch
+pprint-fill
+pprint-indent
+pprint-linear
+pprint-newline
+pprint-tab
+pprint-tabular
+previous
+prin1
+probe-file
+proclaim
+provide
+random
+random-state-p
+rassoc
+rassoc-if
+rassoc-if-not
+rational
+rationalize
+rationalp
+read
+read-byte
+read-char
+read-char-no-hang
+read-delimited-list
+read-from-string
+read-line
+read-preserving-whitespace
+readtable-case
+readtablep
+realp
+realpart
+reduce
+rem
+remhash
+remove
+remove-duplicates
+remprop
+rename-file
+rename-package
+replace
+require
+rest
+restart-name
+result-of
+revappend
+reverse
+room
+round
+row-major-aref
+rplaca
+rplacd
+sbit
+scale-float
+scan
+scan-alist
+scan-file
+scan-fn
+scan-fn-inclusive
+scan-hash
+scan-lists-of-lists
+scan-lists-of-lists-fringe
+scan-multiple
+scan-plist
+scan-range
+scan-sublists
+scan-symbols
+schar
+search
+second
+series
+set
+set-char-bit
+set-difference
+set-dispatch-macro-character
+set-exclusive-or
+set-macro-character
+set-pprint-dispatch
+set-syntax-from-char
+seventh
+shadow
+shadowing-import
+short-site-name
+signal
+signum
+simple-bit-vector-p
+simple-condition-format-arguments
+simple-condition-format-string
+simple-string-p
+simple-vector-p
+sin
+sinh
+sixth
+sleep
+slot-boundp
+slot-exists-p
+slot-makunbound
+slot-value
+software-type
+software-version
+some
+sort
+special-form-p
+split
+split-if
+sqrt
+stable-sort
+standard-char-p
+store-value
+stream-element-type
+stream-error-stream
+stream-external-format
+streamp
+string
+string-capitalize
+string-char-p
+string-downcase
+string-equal
+string-greaterp
+string-left-trim
+string-lessp
+string-not-equal
+string-not-greaterp
+string-not-lessp
+string-right-trim
+string-trim
+string-upcase
+string/=
+string<
+string<=
+string=
+string>
+string>=
+stringp
+sublis
+subseq
+subseries
+subsetp
+subst
+subst-if
+subst-if-not
+substitute
+substitute-if
+substitute-if-not
+subtypep
+svref
+sxhash
+symbol-function
+symbol-name
+symbol-package
+symbol-plist
+symbol-value
+symbolp
+synonym-stream-symbol
+tailp
+tan
+tanh
+tenth
+terpri
+third
+to-alter
+translate-logical-pathname
+translate-pathname
+tree-equal
+truename
+truncate
+two-way-stream-input-stream
+two-way-stream-output-stream
+type-error-datum
+type-error-expected-type
+type-of
+typep
+unexport
+unintern
+union
+unread-char
+until
+until-if
+unuse-package
+upgraded-array-element-type
+upgraded-complex-part-type
+upper-case-p
+use-package
+use-value
+user-homedir-pathname
+values
+values-list
+variable-information
+vector
+vector-pop
+vector-push
+vector-push-extend
+vectorp
+warn
+warn
+wild-pathname-p
+write
+write-byte
+write-char
+write-string
+write-to-string
+y-or-n-p
+yes-or-no-p
+zerop
+add-method
+change-class
+class-name
+describe-object
+documentation
+f
+find-method
+function-keywords
+initialize-instance
+make-instance
+make-instances-obsolete
+make-load-form
+method-qualifiers
+no-applicable-method
+no-next-method
+print-object
+reinitialize-instance
+remove-method
+shared-initialize
+slot-missing
+slot-unbound
+update-instance-for-different-class
+update-instance-for-redefined-class
+;
+;clauses
+;
+always
+append
+appending
+as
+collect
+collecting
+count
+counting
+do
+doing
+finally
+for
+if
+initially
+maximize
+maximizing
+minimize
+minimizing
+named
+nconc
+nconcing
+never
+repeat
+return
+sum
+summing
+thereis
+unless
+until
+when
+while
+with
+;
+;macros
+;
+and
+assert
+assert
+call-method
+case
+ccase
+ccase
+check-type
+check-type
+compiler-let
+cond
+ctypecase
+ctypecase
+decf
+declaim
+defclass
+defconstant
+defgeneric
+define-compiler-macro
+define-condition
+define-declaration
+define-method-combination
+define-modify-macro
+define-setf-method
+defmacro
+defmethod
+defpackage
+defparameter
+defstruct
+deftype
+defun
+defvar
+destructuring-bind
+do
+do*
+do-all-symbols
+do-external-symbols
+do-symbols
+dolist
+dotimes
+ecase
+ecase
+encapsulated
+etypecase
+etypecase
+formatter
+gathering
+generic-function
+handler-bind
+handler-case
+ignore-errors
+in-package
+incf
+iterate
+locally
+loop
+loop-finish
+mapping
+multiple-value-bind
+multiple-value-list
+multiple-value-setq
+next-in
+nth-value
+or
+pop
+pprint-exit-if-list-exhausted
+pprint-logical-block
+pprint-pop
+print-unreadable-object
+producing
+prog
+prog*
+prog1
+prog2
+psetf
+psetq
+push
+pushnew
+remf
+restart-bind
+restart-case
+return
+rotatef
+setf
+shiftf
+step
+terminate-producing
+time
+trace
+typecase
+unless
+untrace
+when
+with-accessors
+with-compilation-unit
+with-condition-restarts
+with-hash-table-iterator
+with-input-from-string
+with-open-file
+with-open-stream
+with-output-to-string
+with-package-iterator
+with-simple-restart
+with-slots
+with-standard-io-syntax
+;
+;special
+;
+block
+catch
+compiler-let
+declare
+eval-when
+flet
+function
+generic-flet
+generic-labels
+go
+if
+let
+let*
+load-time-value
+locally
+multiple-value-call
+multiple-value-prog1
+progn
+progv
+quote
+return-from
+setq
+symbol-macrolet
+tagbody
+the
+throw
+unwind-protect
+with-added-methods
+;
+;types
+;
+arithmetic-error
+cell-error
+condition
+control-error
+division-by-zero
+end-of-file
+error
+file-error
+floating-point-overflow
+floating-point-underflow
+package-error
+program-error
+restart
+serious-condition
+simple-condition
+simple-error
+simple-type-error
+simple-warning
+storage-condition
+stream-error
+type-error
+unbound-variable
+undefined-function
+warning
+;
+;type
+;
+series
+series-element-type
+;
+;variables
+;
+*
+**
+***
+*applyhook*
+*break-on-signals*
+*break-on-warnings*
+*compile-file-pathname*
+*compile-file-truename*
+*compile-print*
+*compile-verbose*
+*debug-io*
+*debugger-hook*
+*default-pathname-defaults*
+*error-output*
+*evalhook*
+*features*
+*gensym-counter*
+*load-pathname*
+*load-print*
+*load-truename*
+*load-verbose*
+*macroexpand-hook*
+*modules*
+*package*
+*print-array*
+*print-base*
+*print-case*
+*print-circle*
+*print-escape*
+*print-gensym*
+*print-length*
+*print-level*
+*print-lines*
+*print-miser-width*
+*print-pprint-dispatch*
+*print-pretty*
+*print-radix*
+*print-readably*
+*print-right-margin*
+*query-io*
+*random-state*
+*read-base*
+*read-default-float-format*
+*read-eval*
+*read-suppress*
+*readtable*
+*standard-input*
+*standard-output*
+*suppress-series-warnings*
+*terminal-io*
+*trace-output*
++
+++
++++
+-
+/
+//
+///
\ No newline at end of file
Index: filters/lispfilt.l
Prereq:  1.3 
--- vile-9.4+/filters/lispfilt.l	2003-05-20 16:38:41.000000000 -0400
+++ vile-9.4a/filters/lispfilt.l	2003-09-17 18:11:30.000000000 -0400
@@ -1,14 +1,25 @@
-%x NORMAL QUOTED
+%x NORMAL QUOTED COMMENT
 
 %{
 /*
- * $Id: lispfilt.l,v 1.3 2003/05/20 20:38:41 tom Exp $
+ * $Id: lispfilt.l,v 1.8 2003/09/17 22:11:30 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of lisp code.
+ *
+ * TODO:  implement readtable case directives :upcase, :downcase, :preserve
+ * and :invert
+ *
+ * TODO:  implement other radix than 10 (that may require rewriting this in C)
+ *
+ * TODO:  rewrite this into C anyway, since flex refuses to match "#|" unless
+ * I exclude "|" from {IDENT}.
  */
 
 #include <filters.h>
 
+#define FLTSTACK_EXTRA int sibling; int quoted;
+#include <fltstack.h>
+
 DefineFilter("lisp");
 
 static char *Keyword_attr;
@@ -17,32 +28,70 @@
 static char *String_attr;
 static char *Number_attr;
 
+static char *paren_attr(void);
+
 %}
 
+SIGN		[-+]
+POINT		[.]
+DIGIT		([0-9])
+DECIMAL		[0-9]
+SLASH		[/]
+
+INTEGER		({SIGN}?{DECIMAL}+{POINT}?)|({SIGN}?{DIGIT}+)
+
+RATIO		({DIGIT}+){SLASH}({DIGIT}+)
+
+EXPONENT	([DEFLSdefls]{SIGN}?{DIGIT}+)
+FLOAT		({SIGN}?{DECIMAL}*{POINT}{DECIMAL}+{EXPONENT}?)|({SIGN}?{DECIMAL}+({POINT}{DECIMAL}*){EXPONENT})
+
+NUMBER		{INTEGER}|{RATIO}|{FLOAT}
+
 COMMENT		;[^\n]*
-IDENT		[^[:space:][:digit:]\"\(\)]+
-NUMBER		(\#[BbOoDdXxEeIi])?([+-])?([[:digit:]/.e])+
+IDENT		[^[:space:]\"\(\)|]+
+
+LPAREN		\(
+RPAREN		\)
 
 %%
 
+<NORMAL>#\|		{ BeginQuote(COMMENT, Comment_attr); }
+<COMMENT>\|#		{ FinishQuote(NORMAL); }
+<COMMENT>[\n]		{ flt_bfr_append(yytext, yyleng); }
+<COMMENT>[^\n]		{ flt_bfr_append(yytext, yyleng); }
+
 <NORMAL>{COMMENT}	{ WriteToken(Comment_attr); }
 
-<NORMAL>{NUMBER}	{ WriteToken(Number_attr); }
+<NORMAL>'{LPAREN}	{ push_state(NORMAL);
+			  FLTSTACK_THIS.quoted = 1;
+			  WriteToken(paren_attr());
+			}
+
+<NORMAL>{LPAREN}	{ int save = FLTSTACK_THIS.quoted;
+			  push_state(NORMAL);
+			  FLTSTACK_THIS.quoted = save;
+			  WriteToken(paren_attr());
+			}
 
-<NORMAL>\({IDENT}	{ flt_putc('('); WriteToken2(Keyword_attr, 1); }
+<NORMAL>{RPAREN}	{ WriteToken(paren_attr()); pop_state(); }
 
-<NORMAL>{IDENT}		{ WriteToken(Ident_attr); }
+<NORMAL>{NUMBER}	{ WriteToken(Number_attr); }
 
-<NORMAL>\"		{ BeginQuote(QUOTED, String_attr); }
+<NORMAL>{IDENT}		{ WriteToken(ci_keyword_attr(yytext)); }
 
+<NORMAL>\"		{ BeginQuote(QUOTED, String_attr); }
 <QUOTED>\\.		{ flt_bfr_append(yytext, yyleng); }
-
 <QUOTED>[^\\\"]+	{ flt_bfr_append(yytext, yyleng); }
-
 <QUOTED>\"		{ FinishQuote(NORMAL); }
 
 %%
 
+static char *
+paren_attr(void)
+{
+    return (FLTSTACK_THIS.quoted ? String_attr : "");
+}
+
 static void
 init_filter(int before GCC_UNUSED)
 {
@@ -53,13 +102,13 @@
 {
     yyin = inputs;
 
-    Keyword_attr  = class_attr(NAME_KEYWORD);
+    Keyword_attr = class_attr(NAME_KEYWORD);
     Comment_attr = class_attr(NAME_COMMENT);
     Ident_attr   = class_attr(NAME_IDENT2);
     String_attr  = class_attr(NAME_LITERAL);
-	Number_attr  = class_attr(NAME_NUMBER);
+    Number_attr  = class_attr(NAME_NUMBER);
 
-    BEGIN(NORMAL);
+    begin_state(NORMAL);
     while (yylex() > 0) {
     }
     flt_bfr_error();
Index: filters/sh-filt.l
Prereq:  1.57 
--- vile-9.4+/filters/sh-filt.l	2003-07-08 20:58:32.000000000 -0400
+++ vile-9.4a/filters/sh-filt.l	2003-08-11 15:11:26.000000000 -0400
@@ -5,7 +5,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/sh-filt.l,v 1.57 2003/07/09 00:58:32 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/sh-filt.l,v 1.58 2003/08/11 19:11:26 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Shell script.
  */
@@ -68,8 +68,8 @@
 QIDENT		({SSTRING}|{DSTRING}|[^ \"'$\t\n])+
 IDENT0		[-]+[0-9]*[a-zA-Z_-]+[0-9a-zA-Z_-]*
 IDENT1		\${NAME}+
-IDENT2		\$\{{IDENT}\}
-IDENT2L		\$\{({IDENT}|{INTEGER})
+IDENT2		\$\{[#]?{IDENT}\}
+IDENT2L		\$\{([#]?{IDENT}|{INTEGER})
 IDENT2R		\}
 IDENTEQLS	[a-zA-Z_]{NAME}*=
 IDENTX		\$[\*@#\?\$!-]
Index: macros/which.rc
Prereq:  1.2 
--- vile-9.4+/macros/which.rc	2002-10-22 07:35:40.000000000 -0400
+++ vile-9.4a/macros/which.rc	2003-10-08 16:34:29.000000000 -0400
@@ -1,4 +1,4 @@
-;; $Header: /usr/build/vile/vile/macros/RCS/which.rc,v 1.2 2002/10/22 11:35:40 tom Exp $
+;; $Header: /usr/build/vile/vile/macros/RCS/which.rc,v 1.4 2003/10/08 20:34:29 tom Exp $
 ;;
 ;; Show where vile looks for keyword file, and where it finds it.  If we
 ;; always implemented built-in filters, the natural place for this would be
@@ -11,6 +11,7 @@
 	newline
 	~if &rd $1
 		insert-string '* '
+		setv %found="yes"
 	~else
 		insert-string '  '
 	~endif
@@ -18,8 +19,9 @@
 ~endm
 
 store-procedure which-keywords major="MajorMode" "Prompt for, and display location of keyword files"
-	~local %terse %path %leaf %suffix %pathdot %dothides %index %mybuffer
+	~local %terse %path %leaf %suffix %pathdot %dothides %index %mybuffer %found
 	setv %terse=$terse
+	setv %found="no"
 	set terse
 	;
 	setv %mybuffer='[Which Keywords]'
@@ -80,3 +82,79 @@
 	goto-beginning-of-file
 	setv $terse=%terse
 ~endm
+
+~if &seq $progname "xvile"
+store-procedure which-menu "Display location of menu file"
+	~local %terse %path %leaf %suffix %pathdot %dothides %index %mybuffer %found %dotname
+	setv %terse=$terse
+	setv %found="no"
+	set terse
+	;
+	setv %mybuffer='[Which Menufile]'
+	~force select-buffer %mybuffer
+	~if $status
+		setl noreadonly noview
+		~if &greater $bchars 0
+			goto-beginning-of-file
+			delete-lines-til end-of-file
+		~endif
+	~else
+		edit-buffer %mybuffer
+	~endif
+	setl noai
+	;
+	insert-string 'Show which menu-files are tested for:'
+	newline
+	insert-string &cat &chr 9 $menu-file
+	newline
+	insert-string '(* marks found-files)'
+	2 newline
+	;
+	~if &seq $os "win32"
+		setv %dothides=''
+		setv %pathdot='.'
+	~elseif &seq $os "vms"
+		setv %dothides=''
+		setv %pathdot='[]'
+	~else
+		setv %dothides='.'
+		setv %pathdot='.'
+	~endif
+	;
+	; Look for $menu-file in the current and home-directories
+	setv %leaf=$menu-file
+	insert-string '$cwd'
+	which-filename &cat %pathdot &cat $pathname-separator %leaf
+	;
+	newline
+	insert-string '$HOME'
+	which-filename &cat '~' &cat $pathname-separator %leaf
+	;
+	; If dot hides a name, and $menu-file begins with a dot, we are done
+	; with it.  Use "vilemenu.rc" in the other places.  If it does not
+	; begin with a dot, continue using it.
+	setv %dotname &left %leaf 1
+	~if &and \
+		&seq %dothides '.' \
+		&seq %dotname '.'
+		setv %leaf='vilemenu.rc'
+	~endif
+	;
+	newline
+	insert-string '$startup-path'
+	setv %index=0
+	~while true
+		setv %path=&token %index $pathlist-separator $startup-path
+		~if &seq %path ''
+			~break
+		~endif
+		which-filename &cat %path &cat $pathname-separator %leaf
+		setv %index=&add %index 1
+	~endwhile
+	;
+	unmark-buffer
+	setl readonly view
+	goto-beginning-of-file
+	setv $terse=%terse
+~endm
+~endif
Index: main.c
Prereq:  1.510 
--- vile-9.4+/main.c	2003-07-27 11:18:54.000000000 -0400
+++ vile-9.4a/main.c	2003-10-07 21:06:24.000000000 -0400
@@ -22,7 +22,7 @@
  */
 
 /*
- * $Header: /usr/build/vile/vile/RCS/main.c,v 1.510 2003/07/27 15:18:54 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/main.c,v 1.511 2003/10/08 01:06:24 tom Exp $
  */
 
 #define realdef			/* Make global definitions not external */
@@ -179,8 +179,8 @@
 #if OPT_NAMEBST
     build_namebst(nametbl, 0, nametblsize - 1);
 #endif
-    global_val_init();		/* global buffer values */
     charinit();			/* character types -- we need these early  */
+    global_val_init();		/* global buffer values */
     winit(FALSE);		/* command-line */
 #if !SYS_UNIX
     expand_wild_args(&argc, &argv);
@@ -1297,7 +1297,7 @@
 
 #define DFT_HELP_FILE "vile.hlp"
 
-#define DFT_MENU_FILE "vilemenu.rc"
+#define DFT_MENU_FILE ".vilemenu"
 
 #ifdef VILE_LIBDIR_PATH
 #define DFT_LIBDIR_PATH VILE_LIBDIR_PATH
Index: makefile.djg
Prereq:  1.31 
--- vile-9.4+/makefile.djg	2002-06-26 20:17:05.000000000 -0400
+++ vile-9.4a/makefile.djg	2003-09-16 20:14:01.000000000 -0400
@@ -3,7 +3,7 @@
 #
 # T.DANG (dang@cogit.ign.fr)
 #
-# $Header: /usr/build/vile/vile/RCS/makefile.djg,v 1.31 2002/06/27 00:17:05 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/makefile.djg,v 1.32 2003/09/17 00:14:01 tom Exp $
 #
 #
 
@@ -58,11 +58,11 @@
 	strip vile
 	coff2exe vile
 #	-stubedit vile.exe globbing=no
-	pkzip pcvile.zip readme.pc readme vile.exe vile.hlp 
+	zip pcvile.zip readme.pc readme vile.exe vile.hlp 
 	cd macros
-	pkzip ..\pcvile.zip *.rc 
+	zip ..\pcvile.zip *.rc 
 	cd ..
-	pkzip pcvile.zip \\djgpp\\bin\\go32.exe
+	zip pcvile.zip \\djgpp\\bin\\go32-v2.exe
 
 # for my poor slow omnibook, i do incremental linking when working on
 # just a couple of modules...
Index: menu.c
Prereq:  1.42 
--- vile-9.4+/menu.c	2002-01-21 19:12:34.000000000 -0500
+++ vile-9.4a/menu.c	2003-10-08 16:32:16.000000000 -0400
@@ -8,7 +8,7 @@
 /************************************************************************/
 
 /*
- * $Header: /usr/build/vile/vile/RCS/menu.c,v 1.42 2002/01/22 00:12:34 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/menu.c,v 1.43 2003/10/08 20:32:16 tom Exp $
  */
 
 /* Vile includes */
@@ -57,8 +57,8 @@
     char *result = cfg_locate(menu_file, LOCATE_SOURCE);
 #if SYS_UNIX
     /* just for backward compatibility */
-    if (result == 0 && strcmp(menu_file, ".vilemenu")) {
-	result = cfg_locate(".vilemenu", LOCATE_SOURCE);
+    if (result == 0 && strcmp(menu_file, "vilemenu.rc")) {
+	result = cfg_locate("vilemenu.rc", FL_STARTPATH | FL_READABLE);
     }
 #endif
     return result;
Index: patchlev.h
--- vile-9.4+/patchlev.h	2003-08-04 18:34:45.000000000 -0400
+++ vile-9.4a/patchlev.h	2003-09-16 17:58:16.000000000 -0400
@@ -1,2 +1,2 @@
 /* set to "" for no patches */
-#define PATCHLEVEL ""
+#define PATCHLEVEL "a"
Index: revlist
--- vile-9.4+/revlist	2003-08-04 20:37:51.000000000 -0400
+++ vile-9.4a/revlist	2003-10-08 20:49:13.000000000 -0400
@@ -1,6 +1,6 @@
-revlist for vile, version v9_4
+revlist for vile, version v9_4a
 --------------------------------------------------------------------------------
-CHANGES	1.729
+CHANGES	1.731
 CHANGES.R3	1.1
 CHANGES.R4	1.1
 CHANGES.R5	1.1
@@ -13,7 +13,7 @@
 README	1.90
 README.PC	1.31
 README.VMS	1.5
-aclocal.m4	1.125
+aclocal.m4	1.126
 ansi.c	1.44
 api.c	1.34
 api.h	1.12
@@ -39,7 +39,7 @@
 djhandl.c	1.6
 dumbterm.c	1.17
 edef.h	1.313
-estruct.h	1.536
+estruct.h	1.537
 eval.c	1.322
 exec.c	1.259
 externs.c	1.8
@@ -60,9 +60,9 @@
 itbuff.c	1.18
 lckfiles.c	1.11
 line.c	1.160
-main.c	1.510
+main.c	1.511
 makefile.blc	1.17
-makefile.djg	1.31
+makefile.djg	1.32
 makefile.emx	1.5
 makefile.icc	1.13
 makefile.in	1.186
@@ -70,7 +70,7 @@
 makefile.wat	1.26
 makefile.wnt	1.76
 map.c	1.97
-menu.c	1.42
+menu.c	1.43
 mkdirs.sh	1.5
 mkprlenv.wnt	1.8
 mktbls.c	1.130
@@ -85,7 +85,7 @@
 os2keys.h	1.1
 os2pipe.c	1.5
 os2vio.c	1.29
-patchlev.h	1.304
+patchlev.h	1.305
 path.c	1.135
 perl.xs	1.89
 proto.h	1.521
@@ -94,7 +94,7 @@
 random.c	1.272
 regexp.c	1.107
 region.c	1.126
-revlist	v9_4
+revlist	v9_4a
 search.c	1.134
 select.c	1.147
 sinstall.sh	1.1
@@ -110,7 +110,7 @@
 ucrypt.c	1.15
 undo.c	1.84
 version.c	1.55
-vile-9.4.spec	1.1
+vile-9.4.spec	1.2
 vile.1	1.30
 vile.hlp	1.568
 vile.wmconfig	1.1
@@ -137,7 +137,7 @@
 word.c	1.74
 wordmov.c	1.21
 wvwrap.cpp	1.7
-x11.c	1.271
+x11.c	1.272
 x11menu.c	1.6
 xshell.sh	1.4
 xvile.wmconfig	1.1
@@ -145,9 +145,9 @@
 doc/config.doc	1.14
 doc/dir.doc	1.3
 doc/filters.doc	1.30
-doc/indent.pro	1.3
+doc/indent.pro	1.4
 doc/macros.doc	1.89
-doc/menus.doc	1.6
+doc/menus.doc	1.7
 doc/modes.doc	1.11
 doc/oleauto.doc	1.7
 doc/perl.doc	1.2
@@ -194,8 +194,8 @@
 filters/filterio.c	1.22
 filters/filters.c	1.88
 filters/filters.h	1.80
-filters/filters.rc	1.174
-filters/fltstack.h	1.7
+filters/filters.rc	1.176
+filters/fltstack.h	1.8
 filters/genmake.c	1.4
 filters/genmake.mak	1.22
 filters/html.key	1.6
@@ -210,7 +210,8 @@
 filters/latexflt.l	1.35
 filters/lex-filt.l	1.22
 filters/lex.key	1.4
-filters/lispfilt.l	1.3
+filters/lisp.key	1.2
+filters/lispfilt.l	1.8
 filters/m4-filt.c	1.22
 filters/m4.key	1.3
 filters/mail.key	1.3
@@ -260,7 +261,7 @@
 filters/sccs.key	1.1
 filters/sccsfilt.l	1.10
 filters/sed-filt.c	1.19
-filters/sh-filt.l	1.57
+filters/sh-filt.l	1.58
 filters/sh.key	1.4
 filters/sml-filt.l	1.4
 filters/sml.key	1.1
@@ -323,7 +324,7 @@
 macros/vileinit.rc	1.21
 macros/vilemenu.rc	1.2
 macros/vileperl.rc	1.7
-macros/which.rc	1.2
+macros/which.rc	1.4
 perl/Breadcrumbs.pm	1.4
 perl/CaptHook.pm	1.1
 perl/Glob2re.pm	1.1
Index: vile-9.4.spec
Prereq:  1.1 
--- vile-9.4+/vile-9.4.spec	2003-08-04 18:45:48.000000000 -0400
+++ vile-9.4a/vile-9.4.spec	2003-09-16 17:57:59.000000000 -0400
@@ -1,13 +1,14 @@
 Summary: VILE VI Like Emacs editor
-# $Header: /usr/build/vile/vile/RCS/vile-9.4.spec,v 1.1 2003/08/04 22:45:48 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/vile-9.4.spec,v 1.2 2003/09/16 21:57:59 tom Exp $
 Name: vile
-Version: 9.4
+Version: 9.4a
 # each patch should update the version
 Release: 1
 Copyright: GPL
 Group: Applications/Editors
 URL: ftp://invisible-island.net/vile
 Source0: vile-9.4.tgz
+Patch1: vile-9.4a.patch.gz
 # each patch should add itself to this list
 Packager: Thomas Dickey <dickey@invisible-island.net>
 BuildRoot: %{_tmppath}/%{name}-root
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q -n vile-9.4
+%patch1 -p1
 # each patch should add itself to this list
 
 %build
@@ -67,6 +69,9 @@
 %changelog
 # each patch should add its ChangeLog entries here
 
+* Tue Sep 16 2003 Thomas Dickey
+- added patch for 9.4a
+
 * Mon Aug 04 2003 Thomas Dickey
 - 9.4 release
 
Index: x11.c
Prereq:  1.271 
--- vile-9.4+/x11.c	2003-07-27 13:14:46.000000000 -0400
+++ vile-9.4a/x11.c	2003-10-08 16:57:58.000000000 -0400
@@ -2,7 +2,7 @@
  *	X11 support, Dave Lemke, 11/91
  *	X Toolkit support, Kevin Buettner, 2/94
  *
- * $Header: /usr/build/vile/vile/RCS/x11.c,v 1.271 2003/07/27 17:14:46 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/x11.c,v 1.272 2003/10/08 20:57:58 Mark.Robinson Exp $
  *
  */
 
@@ -5441,11 +5441,17 @@
 	    extend_selection(cur_win, nr, nc, False);
 	    break;
 	case Button4:
-	    mvupwind(TRUE, cur_win->wheel_scroll_amount);
+	    if (cur_win->wheel_scroll_amount < 0)
+		backpage(FALSE, 1);
+	    else
+		mvupwind(TRUE, cur_win->wheel_scroll_amount);
 	    (void) update(TRUE);
 	    break;
 	case Button5:
-	    mvdnwind(TRUE, cur_win->wheel_scroll_amount);
+	    if (cur_win->wheel_scroll_amount < 0)
+		forwpage(FALSE, 1);
+	    else
+		mvdnwind(TRUE, cur_win->wheel_scroll_amount);
 	    (void) update(TRUE);
 	    break;
 	}