diff --git a/vile/vile.patch b/vile/vile.patch index 30694e05a8..ddc1a4ac91 100644 --- a/vile/vile.patch +++ b/vile/vile.patch @@ -15,128 +15,3 @@ Index: tcap.h #ifdef NEED_CURSES_H # ifdef HAVE_NCURSESW_NCURSES_H -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); -+ } -+} -+ diff --git a/vile/vile.spec b/vile/vile.spec index 56c755eb8a..6cae051598 100644 --- a/vile/vile.spec +++ b/vile/vile.spec @@ -36,7 +36,8 @@ %define V_patch9 i %define V_patch10 j %define V_patch11 k -%define V_patchL %{V_patch11} +%define V_patch12 l +%define V_patchL %{V_patch12} # package information Name: vile @@ -49,7 +50,7 @@ Class: EVAL Group: Editor License: BeerWare Version: %{V_base}%{V_patchL} -Release: 20041108 +Release: 20041208 # package options %option with_x11 no @@ -68,6 +69,7 @@ Patch8: ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch8}. Patch9: ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch9}.patch.gz Patch10: ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch10}.patch.gz Patch11: ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch11}.patch.gz +Patch12: ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch12}.patch.gz # build information Prefix: %{l_prefix} @@ -100,7 +102,7 @@ AutoReqProv: no %prep %setup -q -n vile-%{V_base} - %patch -p1 -P 1 2 3 4 5 6 7 8 9 10 11 + %patch -p1 -P 1 2 3 4 5 6 7 8 9 10 11 12 %patch -p0 -P 0 %build