Merge from mainline.

1 files changed, 14 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 635a2d72f9c..617bd23ab78 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>
+2011-02-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove no-longer needed getloadavg symbols.
         * m/alpha.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
@@ -24,6 +24,19 @@
         * src/s/netbsd.h (HAVE_GETLOADAVG): Likewise.
         * config.in: Regenerate.
 
+2011-02-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port to Solaris 10, which doesn't support FC_HINT_STYLE.
+        * xftfont.c (FC_HINT_STYLE): #define to "hintstyle" if not
+        defined.
+        * xsettings.c (parse_settings, apply_xft_settings): Don't assume
+        FC_HINT_STYLE is supported.
+
+2011-02-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_set_frame_alpha): Access data before it is free:d.
+        Make sure we don't do x_catch_errors twice.
+
 2011-02-10  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (really-lwlib): Depend on globals.h, for parallel builds.