Mercurial > emacs

diff src/character.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 1d1d5d9bd884
line wrap: on
line diff
--- a/src/character.c	Sat Nov 21 10:32:20 2009 +0000
+++ b/src/character.c	Sat Nov 21 11:52:23 2009 +0000
@@ -405,7 +405,7 @@
     {
       int bytes, thiswidth;
       Lisp_Object val;
-      int c = STRING_CHAR_AND_LENGTH (str + i_byte, len - i_byte, bytes);
+      int c = STRING_CHAR_AND_LENGTH (str + i_byte, bytes);
 
       if (dp)
 	{
@@ -495,7 +495,7 @@
 	  int c;
 
 	  if (multibyte)
-	    c = STRING_CHAR_AND_LENGTH (str + i_byte, len - i_byte, bytes);
+	    c = STRING_CHAR_AND_LENGTH (str + i_byte, bytes);
 	  else
 	    c = str[i_byte], bytes = 1;
 	  chars = 1;
@@ -1061,7 +1061,7 @@
       if (! STRING_MULTIBYTE (string))
 	return make_number (*p);
     }
-  c = STRING_CHAR (p, 0);
+  c = STRING_CHAR (p);
   if (CHAR_BYTE8_P (c))
     c = CHAR_TO_BYTE8 (c);
   else if (! ASCII_CHAR_P (c))