merge trunk

diff --cc src/ChangeLog
index 760bf57,6a08405..69e3eda
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,29 -1,82 +1,108 @@@
 +2011-12-05  Kenichi Handa  <handa@m17n.org>
 +
 +      * coding.c (encode_designation_at_bol): New args charbuf_end and
 +      dst.  Return the number of produced bytes.  Callers changed.
 +      (coding_set_source): Return how many bytes coding->source was
 +      relocated.
 +      (coding_set_destination): Return how many bytes
 +      coding->destination was relocated.
 +      (CODING_DECODE_CHAR, CODING_ENCODE_CHAR, CODING_CHAR_CHARSET)
 +      (CODING_CHAR_CHARSET_P): Adjusted for the avove changes.
 +
 +2011-12-05  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
 +
 +      * coding.c (CODING_CHAR_CHARSET_P): New macro.
 +      (encode_coding_emacs_mule, encode_coding_iso_2022): Use the above
 +      macro (Bug#9318).
 +
 +2011-12-05  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      The following changes are to fix Bug#9318.
 +
 +      * coding.c (CODING_ENCODE_CHAR, CODING_CHAR_CHARSET): New macros.
 +      (encode_coding_emacs_mule, ENCODE_ISO_CHARACTER)
 +      (encode_coding_iso_2022, encode_coding_sjis)
 +      (encode_coding_big5, encode_coding_charset): Use the above macros.
 +
+ 2011-12-05  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * lisp.h (process_quit_flag): Fix external declaration.
+ 
+ 2011-12-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       Don't macro-inline non-performance-critical code.
+       * eval.c (process_quit_flag): New function.
+       * lisp.h (QUIT): Use it.
+ 
+ 2011-12-04  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * nsfns.m (get_geometry_from_preferences): New function.
+       (Fx_create_frame): Call get_geometry_from_preferences (Bug#10103).
+ 
+ 2011-12-04  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * emacs.c (Qkill_emacs): Define.
+       (syms_of_emacs): Initialize it.
+       * keyboard.c (interrupt_signal): Don't call Fkill_emacs here, set
+       Qquit_flag to `kill-emacs' instead.
+       (quit_throw_to_read_char): Add parameter `from_signal'.
+       All callers changed.  Call Fkill_emacs if requested and safe.
+       * lisp.h (QUIT): Call Fkill_emacs if requested.
+ 
+ 2011-12-03  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * widget.c (update_wm_hints): Return if wmshell is null.
+       (widget_update_wm_size_hints): New function.
+ 
+       * widget.h (widget_update_wm_size_hints): Declare.
+ 
+       * xterm.c (x_wm_set_size_hint): If USE_X_TOOLKIT, call
+       widget_update_wm_size_hints (Bug#10104).
+ 
+ 2011-12-03  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * xdisp.c (handle_invisible_prop): If the invisible text ends just
+       before a newline, prepare the bidi iterator for consuming the
+       newline, and keep the current paragraph direction.  (Bug#10183)
+       (redisplay_window): Don't let `margin' become negative.  (Bug#10192)
+ 
+ 2011-12-02  Juri Linkov  <juri@jurta.org>
+ 
+       * search.c (Fword_search_regexp): New Lisp function created from
+       `wordify'.  Change type of arg `lax' from `int' to `Lisp_Object'.
+       (Fword_search_backward, Fword_search_forward)
+       (Fword_search_backward_lax, Fword_search_forward_lax):
+       Use `Fword_search_regexp' instead of `wordify'.  Doc fix.
+       (syms_of_search): Define `Sword_search_regexp'.  (Bug#10145)
+ 
+ 2011-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * fileio.c (Finsert_file_contents): Move after-change-function call
+       to before the "handled:" label, since all "goto handled" appear in
+       cases where the *-change-functions have already been properly called
+       (bug#10117).
+ 
+ 2011-12-01  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * keyboard.c (interrupt_signal): Don't call kill-emacs when
+       waiting for input.  (Bug#10169)
+ 
+ 2011-11-30  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * dispnew.c (adjust_glyph_matrix): Remove the assertion that
+       verifies glyph row's hash code--we have just reallocated the
+       glyphs, so their contents can be complete garbage.  (Bug#10164)
+ 
+ 2011-11-30  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Add missing check.
+ 
+ 2011-11-30  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Ensure ROW's
+       attributes are tested _before_ calling verify_row_hash, to protect
+       against GCC re-ordering of the tests.  (Bug#10164)
+ 
  2011-11-29  Jan Djärv  <jan.h.d@swipnet.se>
  
        * xterm.h (struct x_output): net_wm_state_hidden_seen is new.

diff --cc src/coding.c
Simple merge