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

* charset.h (struct charset.code_space): Now has 15 elements, not 16.

Browse source 
* charset.c (Fdefine_charset_internal): Don't initialize
charset.code_space[15].  The value was garbage, on hosts with
32-bit int.
This commit is contained in:
Paul Eggert 2011-05-01 09:27:34 -07:00
parent dcb79f208a
commit c032b5f8c0
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2011-05-01 Paul Eggert <eggert@cs.ucla.edu>
* charset.h (struct charset.code_space): Now has 15 elements, not 16.
* charset.c (Fdefine_charset_internal): Don't initialize
charset.code_space[15]. The value was garbage, on hosts with
32-bit int.
2011-04-30 Eli Zaretskii <eliz@gnu.org>
* dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)'

8
src/charset.c
View file

@ -869,7 +869,7 @@ usage: (define-charset-internal ...) */)
ASET (attrs, charset_name, args[charset_arg_name]);
val = args[charset_arg_code_space];
for (i = 0, dimension = 0, nchars = 1; i < 4; i++)
for (i = 0, dimension = 0, nchars = 1; ; i++)
{
int min_byte, max_byte;
@ -880,10 +880,12 @@ usage: (define-charset-internal ...) */)
charset.code_space[i * 4] = min_byte;
charset.code_space[i * 4 + 1] = max_byte;
charset.code_space[i * 4 + 2] = max_byte - min_byte + 1;
nchars *= charset.code_space[i * 4 + 2];
charset.code_space[i * 4 + 3] = nchars;
if (max_byte > 0)
dimension = i + 1;
if (i == 3)
break;
nchars *= charset.code_space[i * 4 + 2];
charset.code_space[i * 4 + 3] = nchars;
}
val = args[charset_arg_dimension];

7
src/charset.h
View file

@ -155,10 +155,11 @@ struct charset
byte code of the (N+1)th dimension, <code_space>[4N+1] is a
maximum byte code of the (N+1)th dimension, <code_space>[4N+2] is
(<code_space>[4N+1] - <code_space>[4N] + 1), <code_space>[4N+3]
is a number of characters containd in the first to (N+1)th
dismesions. We get `char-index' of a `code-point' from this
is the number of characters contained in the first through (N+1)th
dimensions, except that there is no <code_space>[15].
We get `char-index' of a `code-point' from this
information. */
int code_space[16];
int code_space[15];
/* If B is a byte of Nth dimension of a code-point, the (N-1)th bit
of code_space_mask[B] is set. This array is used to quickly