Mercurial > emacs

diff src/fns.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 ba3ffbd9c422
children 1d1d5d9bd884
line wrap: on
line diff
--- a/src/fns.c	Sat Nov 21 10:32:20 2009 +0000
+++ b/src/fns.c	Sat Nov 21 11:52:23 2009 +0000
@@ -1711,8 +1711,7 @@
 	{
 	  if (STRING_MULTIBYTE (seq))
 	    {
-	      c = STRING_CHAR (SDATA (seq) + ibyte,
-			       SBYTES (seq) - ibyte);
+	      c = STRING_CHAR (SDATA (seq) + ibyte);
 	      cbytes = CHAR_BYTES (c);
 	    }
 	  else
@@ -1742,8 +1741,7 @@
 	    {
 	      if (STRING_MULTIBYTE (seq))
 		{
-		  c = STRING_CHAR (SDATA (seq) + ibyte,
-				   SBYTES (seq) - ibyte);
+		  c = STRING_CHAR (SDATA (seq) + ibyte);
 		  cbytes = CHAR_BYTES (c);
 		}
 	      else
@@ -3363,7 +3361,7 @@
     {
       if (multibyte)
 	{
-	  c = STRING_CHAR_AND_LENGTH (from + i, length - i, bytes);
+	  c = STRING_CHAR_AND_LENGTH (from + i, bytes);
 	  if (CHAR_BYTE8_P (c))
 	    c = CHAR_TO_BYTE8 (c);
 	  else if (c >= 256)
@@ -3403,7 +3401,7 @@
 
       if (multibyte)
 	{
-	  c = STRING_CHAR_AND_LENGTH (from + i, length - i, bytes);
+	  c = STRING_CHAR_AND_LENGTH (from + i, bytes);
 	  if (CHAR_BYTE8_P (c))
 	    c = CHAR_TO_BYTE8 (c);
 	  else if (c >= 256)
@@ -3427,7 +3425,7 @@
 
       if (multibyte)
 	{
-	  c = STRING_CHAR_AND_LENGTH (from + i, length - i, bytes);
+	  c = STRING_CHAR_AND_LENGTH (from + i, bytes);
 	  if (CHAR_BYTE8_P (c))
 	    c = CHAR_TO_BYTE8 (c);
 	  else if (c >= 256)