Mercurial > emacs

diff src/editfns.c @ 106185:f2cea199b0c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove ignored second argument. All callers changed. * regex.c (STRING_CHAR, STRING_CHAR_AND_LENGTH, RE_STRING_CHAR) (RE_STRING_CHAR_AND_LENGTH): Likewise. * xdisp.c (string_char_and_length): Likewise.
author Andreas Schwab <schwab@linux-m68k.org>
date Sat, 21 Nov 2009 11:52:23 +0000
parents 21bdda3ded62
children af4f4af3e19f
line wrap: on
line diff
--- a/src/editfns.c	Sat Nov 21 10:32:20 2009 +0000
+++ b/src/editfns.c	Sat Nov 21 11:52:23 2009 +0000
@@ -231,7 +231,7 @@
   if (SCHARS (string))
     {
       if (STRING_MULTIBYTE (string))
-	XSETFASTINT (val, STRING_CHAR (SDATA (string), SBYTES (string)));
+	XSETFASTINT (val, STRING_CHAR (SDATA (string)));
       else
 	XSETFASTINT (val, SREF (string, 0));
     }
@@ -2983,7 +2983,7 @@
 		      memcpy (newbuf, buf, sizeof (int) * buf_used);
 		      buf = newbuf;
 		    }
-		  buf[buf_used++] = STRING_CHAR_AND_LENGTH (p, 0, len);
+		  buf[buf_used++] = STRING_CHAR_AND_LENGTH (p, len);
 		  pos_byte += len;
 		}
 	      if (XINT (AREF (elt, i)) != buf[i])
@@ -3052,7 +3052,7 @@
       Lisp_Object val;
 
       if (multibyte)
-	oc = STRING_CHAR_AND_LENGTH (p, MAX_MULTIBYTE_LENGTH, len);
+	oc = STRING_CHAR_AND_LENGTH (p, len);
       else
 	oc = *p, len = 1;
       if (oc < size)
@@ -3064,8 +3064,7 @@
 	      if (string_multibyte)
 		{
 		  str = tt + string_char_to_byte (table, oc);
-		  nc = STRING_CHAR_AND_LENGTH (str, MAX_MULTIBYTE_LENGTH,
-					       str_len);
+		  nc = STRING_CHAR_AND_LENGTH (str, str_len);
 		}
 	      else
 		{