mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-18 18:05:07 +00:00
Code Issues Releases Activity

(Fexpand_abbrev): Fix for the multibyte case.

Browse Source
This commit is contained in:
Kenichi Handa 2002-08-20 07:07:19 +00:00
parent 9bbe03417a
commit 530e075167
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/abbrev.c
View File

@ -238,12 +238,13 @@ Returns the abbrev symbol, if expansion took place. */)
{
register char *buffer, *p;
int wordstart, wordend;
register int wordstart_byte, wordend_byte, idx;
register int wordstart_byte, wordend_byte, idx, idx_byte;
int whitecnt;
int uccount = 0, lccount = 0;
register Lisp_Object sym;
Lisp_Object expansion, hook, tem;
Lisp_Object value;
int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
value = Qnil;
@ -289,26 +290,39 @@ Returns the abbrev symbol, if expansion took place. */)
p = buffer = (char *) alloca (wordend_byte - wordstart_byte);
for (idx = wordstart_byte; idx < wordend_byte; idx++)
for (idx = wordstart, idx_byte = wordstart_byte; idx < wordend; )
{
/* ??? This loop needs to go by characters! */
register int c = FETCH_BYTE (idx);
register int c;
if (multibyte)
{
FETCH_CHAR_ADVANCE (c, idx, idx_byte);
}
else
{
c = FETCH_BYTE (idx_byte);
idx++, idx_byte++;
}
if (UPPERCASEP (c))
c = DOWNCASE (c), uccount++;
else if (! NOCASEP (c))
lccount++;
*p++ = c;
if (multibyte)
p += CHAR_STRING (c, p);
else
*p++ = c;
}
if (VECTORP (current_buffer->abbrev_table))
sym = oblookup (current_buffer->abbrev_table, buffer,
wordend - wordstart, wordend_byte - wordstart_byte);
wordend - wordstart, p - buffer);
else
XSETFASTINT (sym, 0);
if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym)))
sym = oblookup (Vglobal_abbrev_table, buffer,
wordend - wordstart, wordend_byte - wordstart_byte);
wordend - wordstart, p - buffer);
if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym)))
return value;