merge trunk

diff --cc doc/misc/ChangeLog
Simple merge

diff --cc lisp/ChangeLog
index cea29413eb910a13b54dc5ce4177cafb19d0d23e,7ea8d3aa116810252b2471867a691949bd1cede0,7ea8d3aa116810252b2471867a691949bd1cede0..cd86f9d20e4570a1959d597503929fbe334a78bd
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
--- 3/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@@ -1,14 -1,13 -1,13 +1,24 @@@@
+  2010-09-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+  
+       * simple.el (blink-paren-function): Move from C to here.
+       (blink-paren-post-self-insert-function): New function.
+       (post-self-insert-hook): Use it.
+  
+       * emacs-lisp/pcase.el (pcase-split-memq):
+       Fix overenthusiastic optimisation.
+       (pcase-u1): Handle the case of a lambda pred.
+  
 ++2010-08-31  Kenichi Handa  <handa@m17n.org>
 ++
 ++     * international/mule-cmds.el (standard-display-european-internal):
 ++     Setup standard-display-table for 8-bit characters by storing 8-bit
 ++     characters in the element vector.
 ++
 ++     * disp-table.el (standard-display-8bit): Setup
 ++     standard-display-table for 8-bit characters by storing 8-bit
 ++     characters in the element vector.
 ++     (standard-display-european): Likewise.
 ++
   2010-08-31  Masatake YAMATO  <yamato@redhat.com>
   
        * textmodes/nroff-mode.el (nroff-view): New command.

diff --cc lisp/simple.el
Simple merge

diff --cc src/ChangeLog
index d1f789f5dcb94a6a0878c80a376fd77c7bc8e0fe,db8cc1186a540af8c8b6ee59bc05ba09ce653e03,db8cc1186a540af8c8b6ee59bc05ba09ce653e03..8e656b525efd1f90c3b1d55f7b1958acf660336b
--- 1/src/ChangeLog
--- 2/src/ChangeLog
--- 3/src/ChangeLog
+++ b/src/ChangeLog
@@@@ -1,33 -1,11 -1,11 +1,41 @@@@
+  2010-09-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+  
+       * cmds.c (Vblink_paren_function): Remove.
+       (internal_self_insert): Make it insert N chars at a time.
+       Don't call blink-paren-function.
+       (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.