aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorGlenn Morris2011-02-05 14:30:14 -0800
committerGlenn Morris2011-02-05 14:30:14 -0800
commit233ba4d924933cb56129bd7511e6137b7c0b8e3e (patch)
tree741044a058b02f007a55e1fdbe8ac480feba0ada /src/window.c
parent827b77e90f4f3a86abfc82a07a8319f5f4cfb3d3 (diff)
parenta60287ff994ec4d07779128f0df5500bed1b3cf9 (diff)
downloademacs-233ba4d924933cb56129bd7511e6137b7c0b8e3e.tar.gz
emacs-233ba4d924933cb56129bd7511e6137b7c0b8e3e.zip
Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca.
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c
index 41eed893d6a..abf01758c3f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3589,7 +3589,7 @@ Note that the main editor command loop selects the buffer of the
3589selected window before each command. */) 3589selected window before each command. */)
3590 (register Lisp_Object window, Lisp_Object norecord) 3590 (register Lisp_Object window, Lisp_Object norecord)
3591{ 3591{
3592 select_window (window, norecord, 0); 3592 return select_window (window, norecord, 0);
3593} 3593}
3594 3594
3595static Lisp_Object 3595static Lisp_Object