Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-18 10:57:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

(wordify): Do the second loop by chars, not by bytes.

Browse source
This commit is contained in:
Richard M. Stallman 1998-05-01 04:51:20 +00:00
parent b662c4bc6b
commit 1e9582d459
1 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/search.c
View file

@ -1958,18 +1958,35 @@ wordify (string)
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';