merge changes in emacs-23 branch

1 files changed, 35 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index db8cc1186a5..8e656b525ef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,36 @@
         (Fself_insert_command): Adjust accordingly.
         (syms_of_cmds): Don't declare blink-paren-function.
 
+2010-08-31  Kenichi Handa  <handa@m17n.org>
+
+        * dispextern.h (FACE_FOR_CHAR): Use an ASCII face for 8-bit
+        characters.
+
+        * term.c (encode_terminal_code): Fix the previous change.
+        (produce_glyphs): Don't set it->char_to_display here.  Don't
+        handle unibyte-display-via-language-environment here.
+        (produce_special_glyphs): Set temp_it.char_to_display before
+        calling produce_glyphs.
+
+        * xdisp.c (get_next_display_element): Set it->char_to_display
+        here.  Convert all 8-bit bytes from unibyte buffer/string to 8-bit
+        characters.
+        (get_overlay_arrow_glyph_row): Set it.char_to_display too before
+        calling PRODUCE_GLYPHS.
+        (append_space_for_newline): Save and store it->char_to_display.
+        Set it->char_to_display before calling PRODUCE_GLYPHS.
+        (extend_face_to_end_of_line): Set it->char_to_display before
+        calling PRODUCE_GLYPHS.
+        (get_glyph_face_and_encoding): Set the glyph code an 8-bit
+        character to its byte value.
+        (get_char_glyph_code): New function.
+        (produce_stretch_glyph): Set it2.char_to_display too before
+        calling x_produce_glyphs.
+        (x_produce_glyphs): Simplify by using the same code for ASCII and
+        non-ASCII characters.  Don't set it->char_to_display here.  Don't
+        handle unibyte-display-via-language-environment here. For a
+        charater of no glyph, use font->space_width instead of FONT_WIDTH.
+
 2010-08-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * keyboard.c (Fwindow_system): Fix compilation for USE_LISP_UNION_TYPE.
@@ -23,6 +53,11 @@
         * composite.c (composition_update_it): Fix computing of
         cmp_it->width.
 
+2010-08-29  Kenichi Handa  <handa@m17n.org>
+
+        * term.c (encode_terminal_code): Encode byte chars to the
+        correspnding bytes.
+
 2010-08-29  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (ns_draw_window_cursor): Draw BAR_CURSOR correct for R2L.