# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 899140852 0
# Node ID 929ad308aba6739154b0ff94ffa7dee1f309c171
# Parent  8177901b437af43e195c28097999fac348264cde
(wordify): Fix i_byte even in unibyte case for copy loop.
If input is unibyte, make the output unibyte.

diff -r 8177901b437a -r 929ad308aba6 src/search.c
--- a/src/search.c	Mon Jun 29 13:32:48 1998 +0000
+++ b/src/search.c	Mon Jun 29 17:20:52 1998 +0000
@@ -1983,8 +1983,12 @@
     return build_string ("");
 
   adjust = - punct_count + 5 * (word_count - 1) + 4;
-  val = make_uninit_multibyte_string (len + adjust,
-				      STRING_BYTES (XSTRING (string)) + adjust);
+  if (STRING_MULTIBYTE (string))
+    val = make_uninit_multibyte_string (len + adjust,
+					STRING_BYTES (XSTRING (string))
+					+ adjust);
+  else
+    val = make_uninit_string (len + adjust);
 
   o = XSTRING (val)->data;
   *o++ = '\\';
@@ -1999,7 +2003,10 @@
       if (STRING_MULTIBYTE (string))
 	FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte);
       else
-	c = XSTRING (string)->data[i++];
+	{
+	  c = XSTRING (string)->data[i++];
+	  i_byte++;
+	}
 
       if (SYNTAX (c) == Sword)
 	{