Mercurial > emacs

diff src/composite.c @ 108881:5582106cddf0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove obsolete pre-unicode2 macros. * character.h (MULTIBYTE_FORM_LENGTH, PARSE_MULTIBYTE_SEQ): Remove. * composite.c (composition_reseat_it): * data.c (Faset): * fns.c (Ffillarray): * regex.c (re_search_2): Use BYTES_BY_CHAR_HEAD. [!emacs] (BYTES_BY_CHAR_HEAD): Define instead of MULTIBYTE_FORM_LENGTH.
author Juanma Barranquero <lekktu@gmail.com>
date Thu, 03 Jun 2010 21:02:32 +0200
parents 009ef331a2bc
children 2bc9a0c04c87
line wrap: on
line diff
--- a/src/composite.c	Thu Jun 03 21:50:00 2010 +0300
+++ b/src/composite.c	Thu Jun 03 21:02:32 2010 +0200
@@ -1266,7 +1266,7 @@
 	{
 	  if (endpos < 0)
 	    endpos = BEGV;
-	  if (endpos < PT && PT < charpos) 
+	  if (endpos < PT && PT < charpos)
 	    endpos = PT;
 	}
       else if (endpos < 0)
@@ -1317,7 +1317,7 @@
 		  || ! INTEGERP (AREF (elt, 1)))
 		continue;
 	      if (XFASTINT (AREF (elt, 1)) != cmp_it->lookback)
-		goto no_composition;		  
+		goto no_composition;
 	      lgstring = autocmp_chars (elt, charpos, bytepos, endpos,
 					w, face, string);
 	      if (composition_gstring_p (lgstring))
@@ -1389,7 +1389,7 @@
       if (NILP (string))
 	INC_POS (bytepos);
       else
-	bytepos += MULTIBYTE_FORM_LENGTH (SDATA (string) + bytepos, 0);
+	bytepos += BYTES_BY_CHAR_HEAD (*(SDATA (string) + bytepos));
     }
   else
     {