From: Kenichi Handa <handa@m17n.org>
Date: Thu, 2 Feb 2012 09:12:08 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.94~360
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ba1d2c3e9231ac0988923ed34711c20c7f013e5a;p=emacs.git

merge trunk
---

ba1d2c3e9231ac0988923ed34711c20c7f013e5a
diff --cc lisp/ChangeLog
index 6c89f4e528d,9a4132fa3a6..7b1c34b2b6c
--- a/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 d291f5f4e64,77c3bc4f5dd..7ccdca9f347
--- a/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