diff options
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/window.c b/src/window.c index 921ea86b3d2..82639b6d8ce 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -72,7 +72,6 @@ static int get_leaf_windows (struct window *, struct window **, int); | |||
| 72 | static void window_scroll (Lisp_Object, EMACS_INT, bool, int); | 72 | static void window_scroll (Lisp_Object, EMACS_INT, bool, int); |
| 73 | static void window_scroll_pixel_based (Lisp_Object, int, bool, int); | 73 | static void window_scroll_pixel_based (Lisp_Object, int, bool, int); |
| 74 | static void window_scroll_line_based (Lisp_Object, int, bool, int); | 74 | static void window_scroll_line_based (Lisp_Object, int, bool, int); |
| 75 | static int freeze_window_start (struct window *, void *); | ||
| 76 | static Lisp_Object window_list (void); | 75 | static Lisp_Object window_list (void); |
| 77 | static int add_window_to_list (struct window *, void *); | 76 | static int add_window_to_list (struct window *, void *); |
| 78 | static Lisp_Object next_window (Lisp_Object, Lisp_Object, | 77 | static Lisp_Object next_window (Lisp_Object, Lisp_Object, |
| @@ -502,7 +501,6 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap) | |||
| 502 | CHECK_LIVE_WINDOW (window); | 501 | CHECK_LIVE_WINDOW (window); |
| 503 | 502 | ||
| 504 | w = XWINDOW (window); | 503 | w = XWINDOW (window); |
| 505 | w->frozen_window_start_p = 0; | ||
| 506 | 504 | ||
| 507 | /* Make the selected window's buffer current. */ | 505 | /* Make the selected window's buffer current. */ |
| 508 | Fset_buffer (w->contents); | 506 | Fset_buffer (w->contents); |
| @@ -2058,7 +2056,6 @@ replace_window (Lisp_Object old, Lisp_Object new, int setflag) | |||
| 2058 | wset_window_end_vpos (n, make_number (0)); | 2056 | wset_window_end_vpos (n, make_number (0)); |
| 2059 | wset_window_end_pos (n, make_number (0)); | 2057 | wset_window_end_pos (n, make_number (0)); |
| 2060 | n->window_end_valid = 0; | 2058 | n->window_end_valid = 0; |
| 2061 | n->frozen_window_start_p = 0; | ||
| 2062 | } | 2059 | } |
| 2063 | 2060 | ||
| 2064 | tem = o->next; | 2061 | tem = o->next; |
| @@ -6459,38 +6456,6 @@ foreach_window_1 (struct window *w, int (*fn) (struct window *, void *), void *u | |||
| 6459 | return cont; | 6456 | return cont; |
| 6460 | } | 6457 | } |
| 6461 | 6458 | ||
| 6462 | |||
| 6463 | /* Freeze or unfreeze the window start of W unless it is a | ||
| 6464 | mini-window or the selected window. FREEZE_P non-null means freeze | ||
| 6465 | the window start. */ | ||
| 6466 | |||
| 6467 | static int | ||
| 6468 | freeze_window_start (struct window *w, void *freeze_p) | ||
| 6469 | { | ||
| 6470 | if (MINI_WINDOW_P (w) | ||
| 6471 | || (WINDOWP (selected_window) /* Can be nil in corner cases. */ | ||
| 6472 | && (w == XWINDOW (selected_window) | ||
| 6473 | || (MINI_WINDOW_P (XWINDOW (selected_window)) | ||
| 6474 | && ! NILP (Vminibuf_scroll_window) | ||
| 6475 | && w == XWINDOW (Vminibuf_scroll_window))))) | ||
| 6476 | freeze_p = NULL; | ||
| 6477 | |||
| 6478 | w->frozen_window_start_p = freeze_p != NULL; | ||
| 6479 | return 1; | ||
| 6480 | } | ||
| 6481 | |||
| 6482 | |||
| 6483 | /* Freeze or unfreeze the window starts of all leaf windows on frame | ||
| 6484 | F, except the selected window and a mini-window. FREEZE_P non-zero | ||
| 6485 | means freeze the window start. */ | ||
| 6486 | |||
| 6487 | void | ||
| 6488 | freeze_window_starts (struct frame *f, bool freeze_p) | ||
| 6489 | { | ||
| 6490 | foreach_window (f, freeze_window_start, freeze_p ? f : 0); | ||
| 6491 | } | ||
| 6492 | |||
| 6493 | |||
| 6494 | /*********************************************************************** | 6459 | /*********************************************************************** |
| 6495 | Initialization | 6460 | Initialization |
| 6496 | ***********************************************************************/ | 6461 | ***********************************************************************/ |