comparison src/buffer.h @ 106185:f2cea199b0c4

* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove ignored second argument. All callers changed. * regex.c (STRING_CHAR, STRING_CHAR_AND_LENGTH, RE_STRING_CHAR) (RE_STRING_CHAR_AND_LENGTH): Likewise. * xdisp.c (string_char_and_length): Likewise.
author Andreas Schwab <schwab@linux-m68k.org>
date Sat, 21 Nov 2009 11:52:23 +0000
parents bac26aa40069
children 4040ecb0c904 f35e7896a0fe
comparison
equal deleted inserted replaced
106184:0579465d2619 106185:f2cea199b0c4
328 POS is returned. No range checking. */ 328 POS is returned. No range checking. */
329 329
330 #define FETCH_MULTIBYTE_CHAR(pos) \ 330 #define FETCH_MULTIBYTE_CHAR(pos) \
331 (_fetch_multibyte_char_p = (((pos) >= GPT_BYTE ? GAP_SIZE : 0) \ 331 (_fetch_multibyte_char_p = (((pos) >= GPT_BYTE ? GAP_SIZE : 0) \
332 + (pos) + BEG_ADDR - BEG_BYTE), \ 332 + (pos) + BEG_ADDR - BEG_BYTE), \
333 STRING_CHAR (_fetch_multibyte_char_p, 0)) 333 STRING_CHAR (_fetch_multibyte_char_p))
334 334
335 /* Return character at position POS. If the current buffer is unibyte 335 /* Return character at position POS. If the current buffer is unibyte
336 and the character is not ASCII, make the returning character 336 and the character is not ASCII, make the returning character
337 multibyte. */ 337 multibyte. */
338 338
387 387
388 #define BUF_FETCH_MULTIBYTE_CHAR(buf, pos) \ 388 #define BUF_FETCH_MULTIBYTE_CHAR(buf, pos) \
389 (_fetch_multibyte_char_p \ 389 (_fetch_multibyte_char_p \
390 = (((pos) >= BUF_GPT_BYTE (buf) ? BUF_GAP_SIZE (buf) : 0) \ 390 = (((pos) >= BUF_GPT_BYTE (buf) ? BUF_GAP_SIZE (buf) : 0) \
391 + (pos) + BUF_BEG_ADDR (buf) - BEG_BYTE), \ 391 + (pos) + BUF_BEG_ADDR (buf) - BEG_BYTE), \
392 STRING_CHAR (_fetch_multibyte_char_p, 0)) 392 STRING_CHAR (_fetch_multibyte_char_p))
393 393
394 /* Define the actual buffer data structures. */ 394 /* Define the actual buffer data structures. */
395 395
396 /* This data structure describes the actual text contents of a buffer. 396 /* This data structure describes the actual text contents of a buffer.
397 It is shared between indirect buffers and their base buffer. */ 397 It is shared between indirect buffers and their base buffer. */