mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-22 10:26:20 +00:00
(FETCH_STRING_CHAR_ADVANCE, FETCH_STRING_CHAR_ADVANCE_NO_CHECK): Use SBYTES
instead of XSTRING()->size_byte.
This commit is contained in:
parent
20cddf4e9f
commit
9f5348e3c8
@ -1,5 +1,12 @@
|
||||
2002-07-16 Ken Raeburn <raeburn@gnu.org>
|
||||
|
||||
* fontset.c (Fset_fontset_font): Use SDATA instead of
|
||||
XSTRING()->data.
|
||||
|
||||
* charset.h (FETCH_STRING_CHAR_ADVANCE,
|
||||
FETCH_STRING_CHAR_ADVANCE_NO_CHECK): Use SBYTES instead of
|
||||
XSTRING()->size_byte.
|
||||
|
||||
* lisp.h (SDATA, SREF): Produce rvalue.
|
||||
(SSET): New macro.
|
||||
* alloc.c (make_event_array): Use SSET for storing into a string.
|
||||
|
@ -574,7 +574,7 @@ if (1) \
|
||||
if (STRING_MULTIBYTE (STRING)) \
|
||||
{ \
|
||||
unsigned char *ptr = SDATA (STRING) + BYTEIDX; \
|
||||
int space_left = XSTRING (STRING)->size_byte - BYTEIDX; \
|
||||
int space_left = SBYTES (STRING) - BYTEIDX; \
|
||||
int actual_len; \
|
||||
\
|
||||
OUTPUT = STRING_CHAR_AND_LENGTH (ptr, space_left, actual_len); \
|
||||
@ -591,7 +591,7 @@ else
|
||||
if (1) \
|
||||
{ \
|
||||
unsigned char *fetch_string_char_ptr = SDATA (STRING) + BYTEIDX; \
|
||||
int fetch_string_char_space_left = XSTRING (STRING)->size_byte - BYTEIDX; \
|
||||
int fetch_string_char_space_left = SBYTES (STRING) - BYTEIDX; \
|
||||
int actual_len; \
|
||||
\
|
||||
OUTPUT \
|
||||
|
Loading…
Reference in New Issue
Block a user