changeset:   4527:8418d1ad49444db104dd28923211ed61c77115ba
tag:         tip
user:        Stephen J. Turnbull <stephen(a)xemacs.org>
date:        Sun Nov 02 00:34:13 2008 +0900
files:       src/ChangeLog src/regex.c
description:
Fix at_dot regex under Mule. <87hc6rv53v.fsf(a)uwakimon.sk.tsukuba.ac.jp>
diff -r 38493c0fb95276095275de9f45dda634a7cb8ca6 -r
8418d1ad49444db104dd28923211ed61c77115ba src/ChangeLog
--- a/src/ChangeLog	Sun Nov 02 00:12:13 2008 +0900
+++ b/src/ChangeLog	Sun Nov 02 00:34:13 2008 +0900
@@ -1,3 +1,8 @@ 2008-11-01  Stephen J. Turnbull  <stephe
+2008-11-01  Stephen J. Turnbull  <stephen(a)xemacs.org>
+
+	* regex.c (re_search_2): Fix at_dot by changing charpos to bytepos.
+	From Julian Bradfield <18654.1143.304851.782755(a)krk.inf.ed.ac.uk>.
+
 2008-11-01  Stephen J. Turnbull  <stephen(a)xemacs.org>
 
 	* mule-ccl.c (ccl_driver): Fix off-by-one error.
diff -r 38493c0fb95276095275de9f45dda634a7cb8ca6 -r
8418d1ad49444db104dd28923211ed61c77115ba src/regex.c
--- a/src/regex.c	Sun Nov 02 00:12:13 2008 +0900
+++ b/src/regex.c	Sun Nov 02 00:34:13 2008 +0900
@@ -4313,8 +4313,8 @@ re_search_2 (struct re_pattern_buffer *b
     {
       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;
     }
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches