Index: tcap.h
--- tcap.h.orig	2007-10-04 19:14:46 +0200
+++ tcap.h	2007-10-04 19:15:37 +0200
@@ -19,11 +19,13 @@
 #define MK other_MK	/* workaround for bug in NetBSD 1.5 curses */
 
 /* _XOPEN_SOURCE_EXTENDED is needed for the wide-character X/Open functions */
+#if 0
 #ifdef NCURSES
 #  ifndef _XOPEN_SOURCE_EXTENDED
 #    define _XOPEN_SOURCE_EXTENDED 1
 #  endif
 #endif
+#endif
 
 /*
  * Workaround for breakage in FreeBSD's header files (updates to wchar.h were
Index: filters/conffilt.l
--- filters/conffilt.l.orig	2007-11-25 20:54:54 +0100
+++ filters/conffilt.l	2008-01-07 18:53:31 +0100
@@ -1,8 +1,5 @@
 %x NORMAL QUOTED
 
-%o 10000
-%a 5000
-
 %{
 /*
  * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25 06:48:28 rse Exp $
Index: filters/imakeflt.l
--- filters/imakeflt.l.orig	2006-05-21 21:50:19 +0200
+++ filters/imakeflt.l	2008-01-07 18:53:31 +0100
@@ -1,8 +1,5 @@
 %x NORMAL COMMENT QUOTE1 QUOTE2 CCOMMENT
 
-%a 6000
-%o 10000
-
 %{
 
 /*
Index: filters/infofilt.l
--- filters/infofilt.l.orig	2006-05-21 21:50:19 +0200
+++ filters/infofilt.l	2008-01-07 18:53:31 +0100
@@ -1,7 +1,5 @@
 %s NORMAL QUOTED QUOTES QUOTE1
 
-%o 6000
-
 %{
 
 /*
Index: filters/latexflt.l
--- filters/latexflt.l.orig	2007-11-25 21:00:41 +0100
+++ filters/latexflt.l	2008-01-07 18:56:56 +0100
@@ -1,8 +1,5 @@
 %s TEXT VERBATIM QUOTE_TT QUOTED MATH MATHC
 
-%o 6000
-%a 4000
-
 %{
 /*
  * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25 06:48:28 rse Exp $
Index: filters/lex-filt.l
--- filters/lex-filt.l.orig	2006-05-21 21:50:19 +0200
+++ filters/lex-filt.l	2008-01-07 18:57:13 +0100
@@ -1,10 +1,5 @@
 %s RULES RULE1 RULEX RULER STATES ACTIONS ACTION0 ACTION1 ACTION2 ACTION3 CODE CODE1 COMMENT
 
-%a 20000
-%n 10000
-%o 30000
-%p 25000
-
 %{
 /*
  * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25 06:48:28 rse Exp $
Index: filters/mailfilt.l
--- filters/mailfilt.l.orig	2006-05-21 21:50:19 +0200
+++ filters/mailfilt.l	2008-01-07 18:57:24 +0100
@@ -1,7 +1,5 @@
 %s HEADER BODY
 
-%o 7000
-
 %{
 
 /*
Index: filters/makefilt.l
--- filters/makefilt.l.orig	2006-05-21 21:50:19 +0200
+++ filters/makefilt.l	2008-01-07 18:59:05 +0100
@@ -1,8 +1,5 @@
 %x NORMAL COMMENT QUOTE1 QUOTE2
 
-%a 6000
-%o 10000
-
 %{
 
 /*
Index: filters/mcrlfilt.l
--- filters/mcrlfilt.l.orig	2006-08-08 23:58:57 +0200
+++ filters/mcrlfilt.l	2008-01-07 19:03:06 +0100
@@ -1,7 +1,5 @@
 %s NORMAL 
 
-%o 6000
-
 %{
 
 /*
Index: filters/mms-filt.l
--- filters/mms-filt.l.orig	2006-05-21 21:50:19 +0200
+++ filters/mms-filt.l	2008-01-07 19:08:11 +0100
@@ -1,6 +1,4 @@
 %pointer
-%a 5000
-%o 6000
 
 %{
 
Index: filters/ps-filt.l
--- filters/ps-filt.l.orig	2006-05-21 21:50:19 +0200
+++ filters/ps-filt.l	2008-01-07 19:09:39 +0100
@@ -1,7 +1,5 @@
 %x NORMAL LIT_TEXT HEX_TEXT B85_TEXT
 
-%o 6000
-
 %{
 /*
  * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25 06:48:28 rse Exp $
Index: filters/rpm-filt.l
--- filters/rpm-filt.l.orig	2007-05-26 16:51:13 +0200
+++ filters/rpm-filt.l	2008-01-07 19:11:29 +0100
@@ -1,8 +1,5 @@
 %x META TEXT NORMAL HEREDOC QUOTED QUOTED2 SUBST
 
-%o 10000
-%a 10000
-
 %{
 /*
  * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25 06:48:28 rse Exp $
Index: filters/sccsfilt.l
--- filters/sccsfilt.l.orig	2007-11-26 13:00:06 +0100
+++ filters/sccsfilt.l	2008-01-07 19:11:53 +0100
@@ -1,8 +1,5 @@
 %s DELETE INSERT
 
-%a 10000
-%o 10000
-
 %{
 
 /*
Index: filters/sh-filt.l
--- filters/sh-filt.l.orig	2007-11-25 21:24:20 +0100
+++ filters/sh-filt.l	2008-01-07 19:12:11 +0100
@@ -1,8 +1,5 @@
 %x NORMAL HEREDOC QUOTED SUBST
 
-%o 10000
-%a 5000
-
 %{
 /*
  * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25 06:48:28 rse Exp $
Index: filters/tcl-filt.l
--- filters/tcl-filt.l.orig	2006-05-21 21:50:48 +0200
+++ filters/tcl-filt.l	2008-01-07 19:12:29 +0100
@@ -1,7 +1,5 @@
 %s VERB ARGS
 
-%a 5000
-
 %{
 /*
  * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25 06:48:28 rse Exp $
Index: filters/txt-filt.l
--- filters/txt-filt.l.orig	2007-11-26 13:08:36 +0100
+++ filters/txt-filt.l	2008-01-07 19:12:42 +0100
@@ -1,8 +1,5 @@
 %s TEXT NOTE QUOTED QUOTES
 
-%a 10000
-%o 10000
-
 %{
 
 /*
Index: filters/vilefilt.l
--- filters/vilefilt.l.orig	2007-11-26 13:15:53 +0100
+++ filters/vilefilt.l	2008-01-07 19:13:02 +0100
@@ -1,8 +1,5 @@
 %s NORMAL ACTION REGISTER SETTINGS MAJORMODE_NAME SUBMODE_NAME SUBMODE_VALS WITH_DEFS LITERAL
 
-%o 10000
-%a 6000
-
 %{
 
 /*
Index: filters/sql-filt.l
--- filters/sql-filt.l.orig	2008-06-25 08:44:31 +0200
+++ filters/sql-filt.l	2008-06-25 08:44:58 +0200
@@ -33,21 +33,8 @@
 static int began_state;
 static int saved_state;
 
-static void
-begin_oneliner(void)
-{
-    new_state(ONE_LINE);
-    next_line = LEAD;
-    flt_bfr_begin(String_attr);
-}
-
-static void
-finish_oneliner(void)
-{
-    flt_bfr_finish();
-    new_state(next_line);
-    next_line = LEAD;
-}
+static void begin_oneliner(void);
+static void finish_oneliner(void);
 
 /******************************************************************************/
 
@@ -221,6 +208,22 @@
 %%
 
 static void
+begin_oneliner(void)
+{
+    new_state(ONE_LINE);
+    next_line = 0;
+    flt_bfr_begin(String_attr);
+}
+
+static void
+finish_oneliner(void)
+{
+    flt_bfr_finish();
+    new_state(next_line);
+    next_line = 0;
+}
+
+static void
 init_filter(int before GCC_UNUSED)
 {
     (void) before;