aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-12-25 18:45:43 -0800
committerPaul Eggert2012-12-25 18:45:43 -0800
commit12384b01a92b5f2ac9af84767e04993efd6a18cc (patch)
treefa560dde1b53dc81452249077c0d8cc5b55e1297 /src
parent7073eb6178878346440d37452f286b613997432a (diff)
downloademacs-12384b01a92b5f2ac9af84767e04993efd6a18cc.tar.gz
emacs-12384b01a92b5f2ac9af84767e04993efd6a18cc.zip
* window.c (select_window_1): Now static.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/window.c3
-rw-r--r--src/window.h1
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 @@
12012-12-26 Paul Eggert <eggert@cs.ucla.edu>
2
3 * window.c (select_window_1): Now static, since it's used only here.
4
12012-12-25 Eli Zaretskii <eliz@gnu.org> 52012-12-25 Eli Zaretskii <eliz@gnu.org>
2 6
3 * window.c (window_body_cols): Subtract display margins from the 7 * window.c (window_body_cols): Subtract display margins from the
diff --git a/src/window.c b/src/window.c
index 3fca5b7351e..34a8f8be1e1 100644
--- a/src/window.c
+++ b/src/window.c
@@ -87,6 +87,7 @@ static Lisp_Object window_list_1 (Lisp_Object, Lisp_Object, Lisp_Object);
87static int window_resize_check (struct window *, int); 87static int window_resize_check (struct window *, int);
88static void window_resize_apply (struct window *, int); 88static void window_resize_apply (struct window *, int);
89static Lisp_Object select_window (Lisp_Object, Lisp_Object, int); 89static Lisp_Object select_window (Lisp_Object, Lisp_Object, int);
90static void select_window_1 (Lisp_Object, bool);
90 91
91/* This is the window in which the terminal's cursor should 92/* This is the window in which the terminal's cursor should
92 be left when nothing is being done with it. This must 93 be left when nothing is being done with it. This must
@@ -532,7 +533,7 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap)
532/* Select window with a minimum of fuss, i.e. don't record the change anywhere 533/* Select window with a minimum of fuss, i.e. don't record the change anywhere
533 (not even for redisplay's benefit), and assume that the window's frame is 534 (not even for redisplay's benefit), and assume that the window's frame is
534 already selected. */ 535 already selected. */
535void 536static void
536select_window_1 (Lisp_Object window, bool inhibit_point_swap) 537select_window_1 (Lisp_Object window, bool inhibit_point_swap)
537{ 538{
538 /* Store the old selected window's buffer's point in pointm of the old 539 /* 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);
978extern Lisp_Object Qwindowp, Qwindow_live_p; 978extern Lisp_Object Qwindowp, Qwindow_live_p;
979extern Lisp_Object Vwindow_list; 979extern Lisp_Object Vwindow_list;
980 980
981extern void select_window_1 (Lisp_Object window, bool inhibit_point_swap);
982extern struct window *decode_live_window (Lisp_Object); 981extern struct window *decode_live_window (Lisp_Object);
983extern struct window *decode_any_window (Lisp_Object); 982extern struct window *decode_any_window (Lisp_Object);
984extern bool compare_window_configurations (Lisp_Object, Lisp_Object, bool); 983extern bool compare_window_configurations (Lisp_Object, Lisp_Object, bool);