# HG changeset patch
# User Stephen J. Turnbull <stephen@xemacs.org>
# Date 1225563089 -32400
# Node ID 9b182263dbd7d51b7b1e5e4bfd903cfeafd4e29b
# Parent  6f41fb7f3a6570572f5c03b39d8e9a436dae1ec3# Parent  8418d1ad49444db104dd28923211ed61c77115ba
Merge bytecomp-coding-system-2008-10-29.

diff -r 6f41fb7f3a65 -r 9b182263dbd7 src/ChangeLog
--- a/src/ChangeLog	Wed Oct 29 12:59:48 2008 +0900
+++ b/src/ChangeLog	Sun Nov 02 03:11:29 2008 +0900
@@ -1,3 +1,13 @@
+2008-11-01  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* regex.c (re_search_2): Fix at_dot by changing charpos to bytepos.
+	From Julian Bradfield <18654.1143.304851.782755@krk.inf.ed.ac.uk>.
+
+2008-11-01  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* mule-ccl.c (ccl_driver): Fix off-by-one error.
+	By Julian Bradfield in <18691.16568.526264.972026@krk.inf.ed.ac.uk>.
+
 2008-10-25  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* lisp.h (static_pro): Cast out a warning.
diff -r 6f41fb7f3a65 -r 9b182263dbd7 src/mule-ccl.c
--- a/src/mule-ccl.c	Wed Oct 29 12:59:48 2008 +0900
+++ b/src/mule-ccl.c	Sun Nov 02 03:11:29 2008 +0900
@@ -1455,7 +1455,7 @@
 		  if (XCHARSET_DIMENSION (charset_by_leading_byte (i)) == 1)
 		    i = (((i - FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7)
 			 | (reg[rrr] & 0x7F));
-		  else if (i < MAX_LEADING_BYTE_OFFICIAL_2)
+		  else if (i <= MAX_LEADING_BYTE_OFFICIAL_2)
 		    i = ((i - FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14) 
 		      | reg[rrr];
 		  else
diff -r 6f41fb7f3a65 -r 9b182263dbd7 src/regex.c
--- a/src/regex.c	Wed Oct 29 12:59:48 2008 +0900
+++ b/src/regex.c	Sun Nov 02 03:11:29 2008 +0900
@@ -4313,8 +4313,8 @@
     {
       if (!BUFFERP (lispobj))
 	return -1;
-      range = (BUF_PT (XBUFFER (lispobj)) - BUF_BEGV (XBUFFER (lispobj))
-	       - startpos);
+      range = (BYTE_BUF_PT (XBUFFER (lispobj))
+	       - BYTE_BUF_BEGV (XBUFFER (lispobj)) - startpos);
       if (range < 0)
 	return -1;
     }
diff -r 6f41fb7f3a65 -r 9b182263dbd7 src/text.c