head 1.7; access; symbols OPENPKG_E1_MP_HEAD:1.2 OPENPKG_E1_MP:1.2 OPENPKG_E1_MP_2_STABLE:1.2 OPENPKG_E1_FP:1.2 OPENPKG_2_STABLE_MP:1.2 OPENPKG_2_STABLE_20061018:1.2 OPENPKG_2_STABLE_20060622:1.2 OPENPKG_2_STABLE:1.2.0.4 OPENPKG_2_STABLE_BP:1.2 OPENPKG_2_5_RELEASE:1.2 OPENPKG_2_5_SOLID:1.2.0.2 OPENPKG_2_5_SOLID_BP:1.2 OPENPKG_CW_FP:1.2; locks; strict; comment @# @; 1.7 date 2008.06.25.06.48.28; author rse; state Exp; branches; next 1.6; commitid opi18O0Vvr3Uti8t; 1.6 date 2008.01.14.18.38.48; author rse; state Exp; branches; next 1.5; commitid E0jRZzvHwS1sEpNs; 1.5 date 2008.01.07.18.15.35; author rse; state Exp; branches; next 1.4; commitid 1s3rKXAWDH5rKvMs; 1.4 date 2007.10.04.17.29.03; author cs; state Exp; branches; next 1.3; commitid E9gaVVd6JnCNxiAs; 1.3 date 2007.03.15.08.33.41; author rse; state Exp; branches; next 1.2; commitid CeLrXKbtd6QG6aas; 1.2 date 2004.12.08.08.52.22; author rse; state Exp; branches; next 1.1; 1.1 date 2004.11.01.08.57.49; author rse; state Exp; branches; next ; desc @@ 1.7 log @upgrading package: vile 9.6o -> 9.7a @ text @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.6 2008/01/14 18:38:48 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.6 2008/01/14 18:38:48 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.6 2008/01/14 18:38:48 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.6 2008/01/14 18:38:48 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.6 2008/01/14 18:38:48 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.6 2008/01/14 18:38:48 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.6 2008/01/14 18:38:48 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; @ 1.6 log @upgrading package: vile 9.6b -> 9.6c @ text @d29 1 a29 1 * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.5 2008/01/07 18:15:35 rse Exp $ d64 1 a64 1 * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.5 2008/01/07 18:15:35 rse Exp $ d78 1 a78 1 * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.5 2008/01/07 18:15:35 rse Exp $ d133 1 a133 12 * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.5 2008/01/07 18:15:35 rse Exp $ Index: filters/rb-filt.l --- filters/rb-filt.l.orig 2007-11-25 21:04:46 +0100 +++ filters/rb-filt.l 2008-01-07 19:11:08 +0100 @@@@ -1,7 +1,5 @@@@ %s CODE HERE SSTRING DSTRING RD SUBST -%o 6000 - %{ /* d145 1 a145 1 * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.5 2008/01/07 18:15:35 rse Exp $ d169 1 a169 1 * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.5 2008/01/07 18:15:35 rse Exp $ d180 1 a180 1 * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.5 2008/01/07 18:15:35 rse Exp $ d205 50 @ 1.5 log @upgrading package: vile 9.5t -> 9.6b @ text @d29 1 a29 1 * $Header: /usr/build/vile/vile/filters/RCS/conffilt.l,v 1.3 2007/11/25 19:54:54 tom Exp $ d64 1 a64 1 * $Header: /usr/build/vile/vile/filters/RCS/latexflt.l,v 1.44 2007/11/25 20:00:41 tom Exp $ d78 1 a78 1 * $Header: /usr/build/vile/vile/filters/RCS/lex-filt.l,v 1.60 2006/05/21 19:50:19 tom Exp $ d116 2 a117 1 @@@@ -1,5 +1,3 @@@@ d133 1 a133 1 * $Header: /usr/build/vile/vile/filters/RCS/ps-filt.l,v 1.9 2006/05/21 19:50:19 tom Exp $ d156 1 a156 1 * $Header: /usr/build/vile/vile/filters/RCS/rpm-filt.l,v 1.14 2007/05/26 14:51:13 tom Exp $ d180 1 a180 1 * $Header: /usr/build/vile/vile/filters/RCS/sh-filt.l,v 1.70 2007/11/25 20:24:20 tom Exp $ d191 1 a191 1 * $Header: /usr/build/vile/vile/filters/RCS/tcl-filt.l,v 1.18 2006/05/21 19:50:48 tom Exp $ @ 1.4 log @upgrading package: vile 9.5o -> 9.5r @ text @d18 197 @ 1.3 log @upgrading package: vile 9.5n -> 9.5o @ text @d2 2 a3 2 --- tcap.h.orig 2002-12-22 18:19:16 +0100 +++ tcap.h 2004-11-01 09:31:24 +0100 d16 2 a17 14 #ifdef NEED_CURSES_H # ifdef HAVE_NCURSESW_NCURSES_H Index: makefile.in --- makefile.in.orig 2007-03-15 09:30:19 +0100 +++ makefile.in 2007-03-15 09:31:17 +0100 @@@@ -269,7 +269,7 @@@@ # ucrypt.o # xterm.o OBJ = $(SCREEN)$o \ - main$o basic$o bind$o buffer$o csrch$o \ + main$o basic$o bind$o buffer$o csrch$o charsets$o \ display$o dumbterm$o eval$o exec$o externs$o fences$o file$o \ filec$o fileio$o finderr$o glob$o globals$o \ input$o insert$o itbuff$o lckfiles$o line$o map$o \ @ 1.2 log @upgrading package: vile 9.4k -> 9.4l @ text @d18 12 @ 1.1 log @upgrading package: vile 9.4i -> 9.4j @ text @a17 125 Index: filters/dcl-filt.l --- filters/dcl-filt.l.orig 2004-11-01 09:42:08 +0100 +++ filters/dcl-filt.l 2004-11-01 09:42:47 +0100 @@@@ -37,59 +37,9 @@@@ static char *look_for = 0; -static void -handle_ident(char *text, int length) -{ - char *attr = ci_keyword_attr(text); - char *temp = lowercase_of(text); - flt_puts(text, length, attr); - if (!strcmp(temp, "deck")) { - /* FIXME: "DECK" can also have an option /dollars whose value would - * be the actual string to search for. - */ - look_for = "eod"; - } -} - -static void -handle_newline(void) -{ - flt_putc('\n'); - if (look_for != 0) { - BEGIN(LITERAL); - } -} - -static void -handle_literal(char *text, int length) -{ - int dollars = 0; - - if (*text == '$') { - flt_puts(text, 1, Comment_attr); - ++text; - --length; - dollars = 1; - } - while (length > 0 && isspace(CharOf(*text))) { - flt_putc(*text); - ++text; - --length; - } - if (length > 0) { - char *attr = String_attr; - - if (dollars) { - char *temp = lowercase_of(text); - if (!strcmp(temp, look_for)) { - look_for = 0; - attr = ci_keyword_attr(temp); - BEGIN(NORMAL); - } - } - flt_puts(text, length, attr); - } -} +static void handle_ident(char *text, int length); +static void handle_newline(void); +static void handle_literal(char *text, int length); %} @@@@ -160,3 +110,58 @@@@ while (yylex() > 0) { } } + +static void +handle_ident(char *text, int length) +{ + char *attr = ci_keyword_attr(text); + char *temp = lowercase_of(text); + flt_puts(text, length, attr); + if (!strcmp(temp, "deck")) { + /* FIXME: "DECK" can also have an option /dollars whose value would + * be the actual string to search for. + */ + look_for = "eod"; + } +} + +static void +handle_newline(void) +{ + flt_putc('\n'); + if (look_for != 0) { + BEGIN(LITERAL); + } +} + +static void +handle_literal(char *text, int length) +{ + int dollars = 0; + + if (*text == '$') { + flt_puts(text, 1, Comment_attr); + ++text; + --length; + dollars = 1; + } + while (length > 0 && isspace(CharOf(*text))) { + flt_putc(*text); + ++text; + --length; + } + if (length > 0) { + char *attr = String_attr; + + if (dollars) { + char *temp = lowercase_of(text); + if (!strcmp(temp, look_for)) { + look_for = 0; + attr = ci_keyword_attr(temp); + BEGIN(NORMAL); + } + } + flt_puts(text, length, attr); + } +} + @