2004-12-08 [colin] 0.9.13cvs8.1

	* src/quote_fmt_parse.y
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index efe6dd3899c5dc756db12afff2a8b2589e7b5ef9..05b4df2a67bd2e41d00271a911e84c6c939406da 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-12-08 [colin]     0.9.13cvs8.1
+
+       * src/quote_fmt_parse.y
+               Sync with HEAD
+
 2004-12-08 [colin]     0.9.13cvs7.1
 
        * src/matcher_parser_parse.y

diff --git a/PATCHSETS b/PATCHSETS
index 53b078039729ffa79fbdcbe627d8c35e85b0b92a..58a8e5de2f4fffedc12d9c212c5ca5fb0e749f44 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -281,3 +281,4 @@
 ( cvs diff -u -r 1.49.2.26 -r 1.49.2.27 src/procmime.c; ) > 0.9.13cvs2.2.patchset
 ( cvs diff -u -r 1.22.2.3 -r 1.22.2.4 src/quote_fmt_parse.y; cvs diff -u -r 1.96.2.36 -r 1.96.2.37 src/textview.c; cvs diff -u -r 1.12.2.9 -r 1.12.2.10 src/gtk/prefswindow.c; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/gtk/pluginwindow.c; ) > 0.9.13cvs6.1.patchset
 ( cvs diff -u -r 1.25.2.6 -r 1.25.2.7 src/matcher_parser_parse.y; cvs diff -u -r 1.16.2.10 -r 1.16.2.11 src/msgcache.c; cvs diff -u -r 1.43.2.10 -r 1.43.2.11 src/prefs_matcher.c; cvs diff -u -r 1.47.2.11 -r 1.47.2.12 src/procheader.c; cvs diff -u -r 1.75.2.3 -r 1.75.2.4 src/matcher.c; cvs diff -u -r 1.9.2.8 -r 1.9.2.9 src/common/defs.h; cvs diff -u -r 1.17.2.6 -r 1.17.2.7 po/sr.po; ) > 0.9.13cvs7.1.patchset
+( cvs diff -u -r 1.22.2.4 -r 1.22.2.5 src/quote_fmt_parse.y; ) > 0.9.13cvs8.1.patchset

diff --git a/configure.ac b/configure.ac
index a04673d0fd550cf427590d1245b2532faf6e7838..79a4749fe4810004f8bd203274fb40c65d7b9c26 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=8
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index bdbcd7aac6c80a7630b08841446bcd8e0d46887e..a28647fb5e948278eebc07d9d1a61fc0c5b84546 100644 (file)
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -205,12 +205,12 @@ string:
                int len;
                
                strncpy($$, $1, sizeof($$));
+               $$[sizeof($$) - 1] = '\0';
                len = strlen($$);
                if (len + 1 < sizeof($$)) {
                        $$[len + 1] = '\0';
                        $$[len] = $2;
                }
-               $$[sizeof($$) - 1] = '\0';
        };
 
 special: