Mercurial > hg > xemacs-beta

diff src/minibuf.c @ 272:c5d627a313b1 r21-0b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b34
author cvs
date Mon, 13 Aug 2007 10:28:48 +0200
parents 966663fcf606
children 8626e4521993
line wrap: on
line diff
--- a/src/minibuf.c	Mon Aug 13 10:27:41 2007 +0200
+++ b/src/minibuf.c	Mon Aug 13 10:28:48 2007 +0200
@@ -351,7 +351,7 @@
 
   bestmatch = Qnil;
   blength = 0;
-  slength = string_char_length (XSTRING (string));
+  slength = XSTRING_CHAR_LENGTH (string);
 
   /* If ALIST is not a list, set TAIL just for gc pro.  */
   tail = alist;
@@ -414,7 +414,7 @@
 
       if (STRINGP (eltstring))
 	{
-	  Charcount eltlength = string_char_length (XSTRING (eltstring));
+	  Charcount eltlength = XSTRING_CHAR_LENGTH (eltstring);
 	  if (slength <= eltlength
 	      && (0 > scmp (XSTRING_DATA (eltstring),
                             XSTRING_DATA (string),
@@ -554,7 +554,7 @@
     return call3 (alist, string, pred, Qt);
 
   allmatches = Qnil;
-  slength = string_char_length (XSTRING (string));
+  slength = XSTRING_CHAR_LENGTH (string);
 
   /* If ALIST is not a list, set TAIL just for gc pro.  */
   tail = alist;
@@ -610,10 +610,10 @@
       /* Is this element a possible completion? */
 
       if (STRINGP (eltstring)
-          && (slength <= string_char_length (XSTRING (eltstring)))
+          && (slength <= XSTRING_CHAR_LENGTH (eltstring))
 	  /* Reject alternatives that start with space
 	     unless the input starts with space.  */
-	  && ((string_char_length (XSTRING (string)) > 0 &&
+	  && ((XSTRING_CHAR_LENGTH (string) > 0 &&
 	       string_char (XSTRING (string), 0) == ' ')
 	      || string_char (XSTRING (eltstring), 0) != ' ')
           && (0 > scmp (XSTRING_DATA (eltstring),