Mercurial > emacs
comparison src/term.c @ 90054:f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709
Update from CVS: src/indent.c (Fvertical_motion): Fix last change.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 08 Dec 2004 05:02:30 +0000 |
| parents | 68c22ea6027c 24c51e9d8586 |
| children | 9b0bfaaaec9c |
comparison
equal
deleted
inserted
replaced
| 90053:fff5f1a61d92 | 90054:f2ebccfa87d4 |
|---|---|
| 952 if (len <= 0) | 952 if (len <= 0) |
| 953 return; | 953 return; |
| 954 | 954 |
| 955 cmplus (len); | 955 cmplus (len); |
| 956 | 956 |
| 957 /* If terminal_coding does any conversion, use it, otherwise use | |
| 958 safe_terminal_coding. We can't use CODING_REQUIRE_ENCODING here | |
| 959 because it always return 1 if the member src_multibyte is 1. */ | |
| 960 coding = (terminal_coding.common_flags & CODING_REQUIRE_ENCODING_MASK | |
| 961 ? &terminal_coding : &safe_terminal_coding); | |
| 957 /* The mode bit CODING_MODE_LAST_BLOCK should be set to 1 only at | 962 /* The mode bit CODING_MODE_LAST_BLOCK should be set to 1 only at |
| 958 the tail. */ | 963 the tail. */ |
| 959 terminal_coding.mode &= ~CODING_MODE_LAST_BLOCK; | 964 coding->mode &= ~CODING_MODE_LAST_BLOCK; |
| 960 | 965 |
| 961 while (len > 0) | 966 while (len > 0) |
| 962 { | 967 { |
| 963 /* Identify a run of glyphs with the same face. */ | 968 /* Identify a run of glyphs with the same face. */ |
| 964 int face_id = string->face_id; | 969 int face_id = string->face_id; |
| 1004 register int len; | 1009 register int len; |
| 1005 { | 1010 { |
| 1006 char *buf; | 1011 char *buf; |
| 1007 struct glyph *glyph = NULL; | 1012 struct glyph *glyph = NULL; |
| 1008 struct frame *f, *sf; | 1013 struct frame *f, *sf; |
| 1014 unsigned char *conversion_buffer; | |
| 1015 unsigned char space[1]; | |
| 1016 struct coding_system *coding; | |
| 1009 | 1017 |
| 1010 if (len <= 0) | 1018 if (len <= 0) |
| 1011 return; | 1019 return; |
| 1012 | 1020 |
| 1013 if (insert_glyphs_hook) | 1021 if (insert_glyphs_hook) |
| 2237 int buffer_size = 4096; | 2245 int buffer_size = 4096; |
| 2238 register char *p; | 2246 register char *p; |
| 2239 int status; | 2247 int status; |
| 2240 struct frame *sf = XFRAME (selected_frame); | 2248 struct frame *sf = XFRAME (selected_frame); |
| 2241 | 2249 |
| 2250 encode_terminal_bufsize = 0; | |
| 2251 | |
| 2242 #ifdef WINDOWSNT | 2252 #ifdef WINDOWSNT |
| 2243 initialize_w32_display (); | 2253 initialize_w32_display (); |
| 2244 | 2254 |
| 2245 Wcm_clear (); | 2255 Wcm_clear (); |
| 2246 | 2256 |
