merge trunk

diff --cc lisp/ChangeLog
index 2ee709f62b21b196d3ffee80a22c0c14af0dad5b,7d05f85f2474a3b6b5e28650779b5f468191b90b..ce373a42e7cbe6a53d9bbcc07ad5d4422c62ed8b
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,27 +1,32 @@@
- 2012-02-01  Kenichi Handa  <handa@m17n.org>
++2012-02-02  Kenichi Handa  <handa@m17n.org>
 +
 +      * composite.el (compose-region, compose-string): Signal error for
 +      a null string component (Bug#6988).
 +
+ 2012-02-01  Chong Yidong  <cyd@gnu.org>
+ 
+       * view.el (view-buffer-other-window, view-buffer-other-frame):
+       Handle special modes like view-buffer (Bug#10650).
+       (view-buffer): Simplify.
+ 
+       * frame.el (set-frame-font): Tweak meaning of third argument.
+ 
+       * dynamic-setting.el (font-setting-change-default-font): Use
+       set-frame-font (Bug#9982).
+ 
+ 2012-02-01  Glenn Morris  <rgm@gnu.org>
+ 
+       * progmodes/compile.el (compilation-internal-error-properties):
+       Respect compilation-first-column in the "*compilation*" buffer.
+ 
+       * emacs-lisp/easy-mmode.el (define-minor-mode):
+       Relax :variable's test for a named function.
+ 
+ 2012-01-31  Alan Mackenzie  <acm@muc.de>
+ 
+       * progmodes/cc-engine.el (c-guess-basic-syntax): CASE 5B.1: Fix an
+       off by one error.
+ 
  2012-01-31  Chong Yidong  <cyd@gnu.org>
  
        * frame.el (set-frame-font): New arg ALL-FRAMES.

diff --cc src/ChangeLog
index c41202bcfee6eeb5ac2ebae3fa02b3a30ebbc066,6d647530ad21f89f8522f0531a546274b7e6828d..eebb10fb472819931dd80043fa21a8371c9a159a
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,10 -1,10 +1,17 @@@
- 2012-02-01  Kenichi Handa  <handa@m17n.org>
++2012-02-02  Kenichi Handa  <handa@m17n.org>
 +
 +      * xdisp.c (BUILD_COMPOSITE_GLYPH_STRING): Initialize first_s to
 +      NULL (Bug#6988).
 +      (x_produce_glyphs): If the component of a composition is a null
 +      string, set it->pixel_width to 1 to avoid zero-width glyph.
 +
+ 2012-02-01  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * ralloc.c (resize_bloc, r_alloc_sbrk): Don't call memmove if its
+       first 2 arguments are identical.  This makes inserting large
+       output from a subprocess an order of magnitude faster on
+       MS-Windows, where all sbrk'ed memory is always contiguous.
+ 
  2012-01-31  Glenn Morris  <rgm@gnu.org>
  
        * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>: