From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 10 Jul 2011 04:54:04 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~411
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f5860c118b3beb1c6acd56de08deff4b3d1c2d1;p=emacs.git

Merge from trunk.
---

0f5860c118b3beb1c6acd56de08deff4b3d1c2d1
diff --cc src/ChangeLog
index 83452143fff,72a9a09aaec..cb22a2d08ba
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,12 -1,17 +1,24 @@@
+ 2011-07-09  Juanma Barranquero  <lekktu@gmail.com>
+ 
+ 	* chartab.c (uniprop_table_uncompress): Remove unused local variable.
+ 
+ 2011-07-09  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+ 	* gtkutil.c (qttip_cb): Remove code without function.
+ 
+ 2011-07-09  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* w32.c (pthread_sigmask): New stub.
+ 
  2011-07-08  Paul Eggert  <eggert@cs.ucla.edu>
  
 +	Fix minor problems found by static checking (Bug#9031).
 +	* chartab.c (char_table_set_range, map_sub_char_table)
 +	(uniprop_table_uncompress): Remove unused locals.
 +	(uniprop_table): Now static.
 +	* composite.c (_work_char): Remove unused static var.
 +	* gtkutil.c (qttip_cb): Remove stray no-effect statement.
 +
  	Use pthread_sigmask, not sigprocmask (Bug#9010).
  	sigprocmask is portable only for single-threaded applications, and
  	Emacs can be multi-threaded when it uses GTK.