merge trunk

diff --cc lisp/ChangeLog
index 6c89f4e528d871cee047c1957a062f1b61df9662,9a4132fa3a64f966afe317c207f7d2f6ab25982f..7b1c34b2b6c6a076f84313e23d495006753af786
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,15 +1,19 @@@
+ 2012-02-02  Glenn Morris  <rgm@gnu.org>
+ 
+       * server.el (server-auth-dir): Doc fix.
+       (server-eval-at): Doc fix.  Give an explicit error if !server-use-tcp.
+ 
+       * subr.el (run-mode-hooks): Doc fix.
+ 
+ 2012-02-02  Juri Linkov  <juri@jurta.org>
+ 
+       * image-mode.el (image-toggle-display-image): Remove tautological
+       `major-mode' from the `derived-mode-p' test.
+ 
 +2012-02-02  Kenichi Handa  <handa@m17n.org>
 +
 +      * (compose-region): Cancel previous change.
 +
  2012-02-02  Kenichi Handa  <handa@m17n.org>
  
        * composite.el (compose-region, compose-string): Signal error for

diff --cc src/ChangeLog
index d291f5f4e646456f1c294726d3834b8dbab27f53,77c3bc4f5dd82bd3e322bcab6729de6d9eab9fbf..7ccdca9f347909cf5ca7b9104c948708f0467dba
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,13 +1,18 @@@
+ 2012-02-02  Glenn Morris  <rgm@gnu.org>
+ 
+       * callproc.c (Fcall_process, Fcall_process_region): Doc fix.
+ 
+       * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+       Unconditionally set to t.  (Bug#10673)
+       * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+       * w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
+       * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Doc fix.
+ 
 +2012-02-02  Kenichi Handa  <handa@m17n.org>
 +
 +      (x_produce_glyphs): Cancel previous change.  If cmp->glyph_len is
 +      0, do not call append_composite_glyph.
 +
  2012-02-02  Kenichi Handa  <handa@m17n.org>
  
        * xdisp.c (BUILD_COMPOSITE_GLYPH_STRING): Initialize first_s to