auto upstream

3 files changed, 6 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a2b78cf5679..91fa2cb5f6e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * window.c (select_window_1): Now static, since it's used only here.
+
 2012-12-25  Eli Zaretskii  <eliz@gnu.org>
 
         * window.c (window_body_cols): Subtract display margins from the
diff --git a/src/window.c b/src/window.c
index 1ca2b103b3f..8d307a314be 100644
--- a/src/window.c
+++ b/src/window.c
@@ -88,6 +88,7 @@ static Lisp_Object window_list_1 (Lisp_Object, Lisp_Object, Lisp_Object);
 static int window_resize_check (struct window *, int);
 static void window_resize_apply (struct window *, int);
 static Lisp_Object select_window (Lisp_Object, Lisp_Object, int);
+static void select_window_1 (Lisp_Object, bool);
 
 /* This is the window in which the terminal's cursor should
    be left when nothing is being done with it.  This must
@@ -533,7 +534,7 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap)
 /* Select window with a minimum of fuss, i.e. don't record the change anywhere
    (not even for redisplay's benefit), and assume that the window's frame is
    already selected.  */
-void
+static void
 select_window_1 (Lisp_Object window, bool inhibit_point_swap)
 {
   /* Store the old selected window's buffer's point in pointm of the old
diff --git a/src/window.h b/src/window.h
index 716b9771160..33e88c6f230 100644
--- a/src/window.h
+++ b/src/window.h
@@ -978,7 +978,6 @@ struct glyph *get_phys_cursor_glyph (struct window *w);
 extern Lisp_Object Qwindowp, Qwindow_live_p;
 extern Lisp_Object Vwindow_list;
 
-extern void select_window_1 (Lisp_Object window, bool inhibit_point_swap);
 extern struct window *decode_live_window (Lisp_Object);
 extern struct window *decode_any_window (Lisp_Object);
 extern bool compare_window_configurations (Lisp_Object, Lisp_Object, bool);