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

[bpt/emacs.git] / src / window.c

diff --git a/src/window.c b/src/window.c
index 2feaa27..abf0175 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1,7 +1,6 @@
 /* Window creation, deletion and examination for GNU Emacs.
    Does not include redisplay.
-   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-                 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Copyright (C) 1985-1987, 1993-1998, 2000-2011
                  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -3590,7 +3589,7 @@ Note that the main editor command loop selects the buffer of the
 selected window before each command.  */)
      (register Lisp_Object window, Lisp_Object norecord)
 {
-  select_window (window, norecord, 0);
+  return select_window (window, norecord, 0);
 }
 
 static Lisp_Object