summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-07-09 21:58:22 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-07-09 21:58:22 -0700
commit99033785c7adac8711cc7c56a99c4e3b441648b1 (patch)
tree2926349e2bc296694811931fdd9acd45af519a99
parent0f5860c118b3beb1c6acd56de08deff4b3d1c2d1 (diff)
downloademacs-99033785c7adac8711cc7c56a99c4e3b441648b1.tar.gz
Fix ChangeLog to reflect merge better.
-rw-r--r--src/ChangeLog15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cb22a2d08ba..64ea0a5bcf0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-10 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):
+ Remove unused locals.
+ (uniprop_table): Now static.
+ * composite.c (_work_char): Remove unused static var.
+
2011-07-09 Juanma Barranquero <lekktu@gmail.com>
* chartab.c (uniprop_table_uncompress): Remove unused local variable.
@@ -12,13 +20,6 @@
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.