diff options
| author | Andreas Schwab | 2009-11-21 11:52:23 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2009-11-21 11:52:23 +0000 |
| commit | 62a6e103dd7b9d940565639d6a47c8bdee3f24ce (patch) | |
| tree | 0e2ab8777e97932d73a91e328683bef10dbf7c8d /src/lread.c | |
| parent | c3b616a940d9dab7f8fe4376755a8a8f9a2ba290 (diff) | |
| download | emacs-62a6e103dd7b9d940565639d6a47c8bdee3f24ce.tar.gz emacs-62a6e103dd7b9d940565639d6a47c8bdee3f24ce.zip | |
* 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.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lread.c b/src/lread.c index c565ce9fd5d..97b9410b038 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -303,7 +303,7 @@ readchar (readcharfun, multibyte) | |||
| 303 | /* Fetch the character code from the buffer. */ | 303 | /* Fetch the character code from the buffer. */ |
| 304 | unsigned char *p = BUF_BYTE_ADDRESS (inbuffer, pt_byte); | 304 | unsigned char *p = BUF_BYTE_ADDRESS (inbuffer, pt_byte); |
| 305 | BUF_INC_POS (inbuffer, pt_byte); | 305 | BUF_INC_POS (inbuffer, pt_byte); |
| 306 | c = STRING_CHAR (p, pt_byte - orig_pt_byte); | 306 | c = STRING_CHAR (p); |
| 307 | if (multibyte) | 307 | if (multibyte) |
| 308 | *multibyte = 1; | 308 | *multibyte = 1; |
| 309 | } | 309 | } |
| @@ -332,7 +332,7 @@ readchar (readcharfun, multibyte) | |||
| 332 | /* Fetch the character code from the buffer. */ | 332 | /* Fetch the character code from the buffer. */ |
| 333 | unsigned char *p = BUF_BYTE_ADDRESS (inbuffer, bytepos); | 333 | unsigned char *p = BUF_BYTE_ADDRESS (inbuffer, bytepos); |
| 334 | BUF_INC_POS (inbuffer, bytepos); | 334 | BUF_INC_POS (inbuffer, bytepos); |
| 335 | c = STRING_CHAR (p, bytepos - orig_bytepos); | 335 | c = STRING_CHAR (p); |
| 336 | if (multibyte) | 336 | if (multibyte) |
| 337 | *multibyte = 1; | 337 | *multibyte = 1; |
| 338 | } | 338 | } |
| @@ -439,7 +439,7 @@ readchar (readcharfun, multibyte) | |||
| 439 | } | 439 | } |
| 440 | buf[i++] = c; | 440 | buf[i++] = c; |
| 441 | } | 441 | } |
| 442 | return STRING_CHAR (buf, i); | 442 | return STRING_CHAR (buf); |
| 443 | } | 443 | } |
| 444 | 444 | ||
| 445 | /* Unread the character C in the way appropriate for the stream READCHARFUN. | 445 | /* Unread the character C in the way appropriate for the stream READCHARFUN. |