2005-02-18 [colin] 1.0.1cvs14.1

	* src/quote_fmt_lex.l
	* src/quote_fmt_parse.y
		Fix parser initialisation. Patch by Ivan.

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index b37328dafeae25aa085d8606511e0a40e397a3bf..ee8f25b8b183f689361fa416605f4d2b0c978148 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-02-18 [colin]     1.0.1cvs14.1
+
+       * src/quote_fmt_lex.l
+       * src/quote_fmt_parse.y
+               Fix parser initialisation. Patch by Ivan.
+
 2005-02-18 [colin]     1.0.1cvs11.6
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index ad6156eb8edddae0849714e89309262a19dfc9bc..44313f10c628f06c9ddf6e4bf0e2c92fe0c60d4b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -388,3 +388,4 @@
 ( cvs diff -u -r 1.382.2.102 -r 1.382.2.103 src/compose.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/exportldif.c; cvs diff -u -r 1.25.2.7 -r 1.25.2.8 src/matcher_parser_parse.y; cvs diff -u -r 1.49.2.34 -r 1.49.2.35 src/procmime.c; cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/sourcewindow.c; cvs diff -u -r 1.24.2.5 -r 1.24.2.6 src/common/Makefile.am; cvs diff -u -r -1.1.4.2 -r -1.1.4.3 src/common/intl.h; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c; ) > 1.0.1cvs11.4.patchset
 ( cvs diff -u -r 1.65.2.23 -r 1.65.2.24 src/codeconv.c; cvs diff -u -r 1.83.2.31 -r 1.83.2.32 src/mimeview.c; ) > 1.0.1cvs11.5.patchset
 ( cvs diff -u -r 1.207.2.30 -r 1.207.2.31 src/folderview.c; ) > 1.0.1cvs11.6.patchset
+( cvs diff -u -r 1.8.2.1 -r 1.8.2.2 src/quote_fmt_lex.l; cvs diff -u -r 1.22.2.6 -r 1.22.2.7 src/quote_fmt_parse.y; ) > 1.0.1cvs14.1.patchset

diff --git a/configure.ac b/configure.ac
index 1a6f669c3ec9121cd478e6971ab751e87df1e1bb..c408622248407d20d794305ec4370c60892e27ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=14
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.6
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/quote_fmt_lex.l b/src/quote_fmt_lex.l
index 5c35a7d7aeac7cd48da251c9b83f7a227ce516ab..04975d63ee4877667fbd64b4fe119f70676e5f9a 100644 (file)
--- a/src/quote_fmt_lex.l
+++ b/src/quote_fmt_lex.l
@@ -14,7 +14,7 @@
 /*
  * see notes below.
  */
-static int firsttime = 1;
+int quote_fmt_firsttime = 1;
 %}
 
 %%
@@ -43,9 +43,9 @@ static int firsttime = 1;
 %} 
 
 %{
-       if (firsttime) {
+       if (quote_fmt_firsttime) {
                BEGIN S_NORMAL;
-               firsttime = 0;
+               quote_fmt_firsttime = 0;
        }       
 %}
 

diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 31336ca5e0c7f271768f38ee618a5b2c2e1778ad..2d951e40d561670e85302cdde6eff2ab9a2f6b1b 100644 (file)
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -54,6 +54,8 @@ static gint error = 0;
 
 static gint cursor_pos  = 0;
 
+extern int quote_fmt_firsttime;
+
 static void add_visibility(gboolean val)
 {
        stacksize++;
@@ -125,6 +127,10 @@ void quote_fmt_init(MsgInfo *info, const gchar *my_quote_str,
                *buffer = 0;
        bufsize = 0;
        error = 0;
+        /*
+         * force LEX initialization
+         */
+       quote_fmt_firsttime = 1;
        cursor_pos = 0;
 }