merge emacs-23

diff --cc src/ChangeLog
index 8af6bafd90327c6074255d616f4bf73988e633b2,0ee89f646fe366a916e15d7f9e161c2028d9a186..8bc84675c92251281b15b29c9aeb29932f3e1e5f
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
 +2011-02-02  Kenichi Handa  <handa@m17n.org>
 +
 +      * ftfont.c (ftfont_open): Use FC_DUAL only when it is defined.
 +
 +      * xftfont.c (xftfont_open): Likewise.
 +
+ 2011-02-01  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * window.c (Fselect_window): Add missing return value.
+ 
  2011-01-29  Andreas Schwab  <schwab@linux-m68k.org>
  
        * image.c (DEF_IMGLIB_FN): Add parameter rettype, use it instead