merge emacs-23

2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8af6bafd903..8bc84675c92 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,10 @@
 
         * 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
diff --git a/src/window.c b/src/window.c
index c81a20610f1..12775ffa7d4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3682,7 +3682,7 @@ selected window before each command.  */)
      (window, norecord)
      register Lisp_Object window, norecord;
 {
-  select_window (window, norecord, 0);
+  return select_window (window, norecord, 0);
 }
 
 static Lisp_Object