Mercurial > emacs

changeset 21887:1c9f20274f76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(wordify): Do the second loop by chars, not by bytes.
author Richard M. Stallman <rms@gnu.org>
date Fri, 01 May 1998 04:51:20 +0000
parents ca7b274a97d9
children 6ce89105f98f
files src/search.c
diffstat 1 files changed, 28 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/search.c	Fri May 01 04:50:27 1998 +0000
+++ b/src/search.c	Fri May 01 04:51:20 1998 +0000
@@ -1958,18 +1958,35 @@
   o = XSTRING (val)->data;
   *o++ = '\\';
   *o++ = 'b';
+  prev_c = 0;
 
-  for (i = 0; i < STRING_BYTES (XSTRING (val)); i++)
-    if (SYNTAX (p[i]) == Sword)
-      *o++ = p[i];
-    else if (i > 0 && SYNTAX (p[i-1]) == Sword && --word_count)
-      {
-	*o++ = '\\';
-	*o++ = 'W';
-	*o++ = '\\';
-	*o++ = 'W';
-	*o++ = '*';
-      }
+  for (i = 0, i_byte = 0; i < len; )
+    {
+      int c;
+      int i_byte_orig = i_byte;
+      
+      if (STRING_MULTIBYTE (string))
+	FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte);
+      else
+	c = XSTRING (string)->data[i++];
+
+      if (SYNTAX (c) == Sword)
+	{
+	  bcopy (&XSTRING (string)->data[i_byte_orig], o,
+		 i_byte - i_byte_orig);
+	  o += i_byte - i_byte_orig;
+	}
+      else if (i > 0 && SYNTAX (prev_c) == Sword && --word_count)
+	{
+	  *o++ = '\\';
+	  *o++ = 'W';
+	  *o++ = '\\';
+	  *o++ = 'W';
+	  *o++ = '*';
+	}
+
+      prev_c = c;
+    }
 
   *o++ = '\\';
   *o++ = 'b';