2007-08-28 [colin] 2.10.0cvs181

	* src/quote_fmt_parse.y
		Fix cursor offset when quote contains UTF-8
		chars

diff --git a/ChangeLog b/ChangeLog
index d59d81ed6016db4bce9830462020c750ed540738..094fa25970f5a2c57605782222aa1bfb5d1c171b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-28 [colin]     2.10.0cvs181
+
+       * src/quote_fmt_parse.y
+               Fix cursor offset when quote contains UTF-8
+               chars
+

 2007-08-28 [colin]     2.10.0cvs180
 
        * src/compose.c
 2007-08-28 [colin]     2.10.0cvs180
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index c8dbad17d3dcde802a777a8d233dba66e4bcdb6f..7ffb27326c741fcf7da20ed731f2fc8bf563a5ed 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2835,3 +2835,4 @@
 ( cvs diff -u -r 1.395.2.321 -r 1.395.2.322 src/summaryview.c;  ) > 2.10.0cvs178.patchset
 ( cvs diff -u -r 1.395.2.322 -r 1.395.2.323 src/summaryview.c;  ) > 2.10.0cvs179.patchset
 ( cvs diff -u -r 1.382.2.403 -r 1.382.2.404 src/compose.c;  cvs diff -u -r 1.50.2.41 -r 1.50.2.42 src/compose.h;  ) > 2.10.0cvs180.patchset
 ( cvs diff -u -r 1.395.2.321 -r 1.395.2.322 src/summaryview.c;  ) > 2.10.0cvs178.patchset
 ( cvs diff -u -r 1.395.2.322 -r 1.395.2.323 src/summaryview.c;  ) > 2.10.0cvs179.patchset
 ( cvs diff -u -r 1.382.2.403 -r 1.382.2.404 src/compose.c;  cvs diff -u -r 1.50.2.41 -r 1.50.2.42 src/compose.h;  ) > 2.10.0cvs180.patchset

+( cvs diff -u -r 1.22.2.35 -r 1.22.2.36 src/quote_fmt_parse.y;  ) > 2.10.0cvs181.patchset

diff --git a/configure.ac b/configure.ac
index e32f1f229540ec1d4384e1fec27e97bc3dd09a3a..a3ef0a0ba1c18c370ea87367a059b134f682851c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=180
+EXTRA_VERSION=181

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 35afce7b4f004c015a13fe764d590bfa0cbca743..6e29c2725e1cdacb33f9090fce579ab03f422982 100644 (file)
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -818,7 +818,10 @@ special:
        }
        | SET_CURSOR_POS
        {
        }
        | SET_CURSOR_POS
        {

-               cursor_pos = current->bufsize;
+               if (current->buffer)
+                       cursor_pos = g_utf8_strlen(current->buffer, -1);
+               else
+                       cursor_pos = 0;

        }
        | SHOW_ADDRESSBOOK_COMPLETION_FOR_CC
        {
        }
        | SHOW_ADDRESSBOOK_COMPLETION_FOR_CC
        {