Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca.

1 files changed, 20 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 02644342d46..d757a89836d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2011-02-05  Glenn Morris  <rgm@gnu.org>
+
+        * xfaces.c (Finternal_set_lisp_face_attribute):
+        Try to clarify some error messages.  (Bug#2659)
+
+2011-02-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * editfns.c (save_restriction_restore): Don't forget to invalidate the
+        current_column cache (bug#7946).
+
+2011-02-05  Kenichi Handa  <handa@m17n.org>
+
+        * ftfont.c (ftfont_open): Use FC_DUAL only when it is defined.
+
+        * xftfont.c (xftfont_open): Likewise.
+
+2011-02-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * window.c (Fselect_window): Add missing return value.
+
 2011-02-05  Paul Eggert  <eggert@cs.ucla.edu>
 
         xstrcasecmp: conform to C89 pointer rules