diff options
| author | Paul Eggert | 2011-03-13 10:28:15 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-13 10:28:15 -0700 |
| commit | 3eca4629203c3038f04db312999ca32d8e292e50 (patch) | |
| tree | 7dab20a2f6de3e300fd266f51b71efd1d9f52188 /src/term.c | |
| parent | 01e0b5adf4e35c2b00705c212b853936fe218cac (diff) | |
| parent | d32df629a23d0e04eb70df9c6e60e821d905c822 (diff) | |
| download | emacs-3eca4629203c3038f04db312999ca32d8e292e50.tar.gz emacs-3eca4629203c3038f04db312999ca32d8e292e50.zip | |
Merge from mainline.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c index e78e2e68814..e84bbe125f8 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -501,7 +501,7 @@ static int encode_terminal_dst_size; | |||
| 501 | Set CODING->produced to the byte-length of the resulting byte | 501 | Set CODING->produced to the byte-length of the resulting byte |
| 502 | sequence, and return a pointer to that byte sequence. */ | 502 | sequence, and return a pointer to that byte sequence. */ |
| 503 | 503 | ||
| 504 | static unsigned char * | 504 | unsigned char * |
| 505 | encode_terminal_code (struct glyph *src, int src_len, struct coding_system *coding) | 505 | encode_terminal_code (struct glyph *src, int src_len, struct coding_system *coding) |
| 506 | { | 506 | { |
| 507 | struct glyph *src_end = src + src_len; | 507 | struct glyph *src_end = src + src_len; |