aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/window.c b/src/window.c
index 2ff149ed4fa..6fd6849c6c3 100644
--- a/src/window.c
+++ b/src/window.c
@@ -72,8 +72,6 @@ static void window_scroll_line_based (Lisp_Object, int, int, int);
72static int freeze_window_start (struct window *, void *); 72static int freeze_window_start (struct window *, void *);
73static Lisp_Object window_list (void); 73static Lisp_Object window_list (void);
74static int add_window_to_list (struct window *, void *); 74static int add_window_to_list (struct window *, void *);
75static int candidate_window_p (Lisp_Object, Lisp_Object, Lisp_Object,
76 Lisp_Object);
77static Lisp_Object next_window (Lisp_Object, Lisp_Object, 75static Lisp_Object next_window (Lisp_Object, Lisp_Object,
78 Lisp_Object, int); 76 Lisp_Object, int);
79static void decode_next_window_args (Lisp_Object *, Lisp_Object *, 77static void decode_next_window_args (Lisp_Object *, Lisp_Object *,
@@ -2213,12 +2211,13 @@ window_list (void)
2213 a window means search the frame that window belongs to, 2211 a window means search the frame that window belongs to,
2214 a frame means consider windows on that frame, only. */ 2212 a frame means consider windows on that frame, only. */
2215 2213
2216static int 2214static bool
2217candidate_window_p (Lisp_Object window, Lisp_Object owindow, Lisp_Object minibuf, Lisp_Object all_frames) 2215candidate_window_p (Lisp_Object window, Lisp_Object owindow,
2216 Lisp_Object minibuf, Lisp_Object all_frames)
2218{ 2217{
2219 struct window *w = XWINDOW (window); 2218 struct window *w = XWINDOW (window);
2220 struct frame *f = XFRAME (w->frame); 2219 struct frame *f = XFRAME (w->frame);
2221 int candidate_p = 1; 2220 bool candidate_p = 1;
2222 2221
2223 if (!BUFFERP (w->contents)) 2222 if (!BUFFERP (w->contents))
2224 candidate_p = 0; 2223 candidate_p = 0;
@@ -5172,7 +5171,7 @@ and redisplay normally--don't erase and redraw the frame. */)
5172 struct window *w = XWINDOW (selected_window); 5171 struct window *w = XWINDOW (selected_window);
5173 struct buffer *buf = XBUFFER (w->contents); 5172 struct buffer *buf = XBUFFER (w->contents);
5174 struct buffer *obuf = current_buffer; 5173 struct buffer *obuf = current_buffer;
5175 int center_p = 0; 5174 bool center_p = 0;
5176 ptrdiff_t charpos, bytepos; 5175 ptrdiff_t charpos, bytepos;
5177 EMACS_INT iarg IF_LINT (= 0); 5176 EMACS_INT iarg IF_LINT (= 0);
5178 int this_scroll_margin; 5177 int this_scroll_margin;