diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 19 |
2 files changed, 3 insertions, 22 deletions
diff --git a/src/window.c b/src/window.c index 4816bd69909..857870591f3 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -4875,7 +4875,7 @@ mark_window_cursors_off (struct window *w) | |||
| 4875 | * window_wants_mode_line: | 4875 | * window_wants_mode_line: |
| 4876 | * | 4876 | * |
| 4877 | * Return 1 if window W wants a mode line and is high enough to | 4877 | * Return 1 if window W wants a mode line and is high enough to |
| 4878 | * accomodate it, 0 otherwise. | 4878 | * accommodate it, 0 otherwise. |
| 4879 | * | 4879 | * |
| 4880 | * W wants a mode line if it's a leaf window and neither a minibuffer | 4880 | * W wants a mode line if it's a leaf window and neither a minibuffer |
| 4881 | * nor a pseudo window. Moreover, its 'window-mode-line-format' | 4881 | * nor a pseudo window. Moreover, its 'window-mode-line-format' |
| @@ -4905,14 +4905,14 @@ window_wants_mode_line (struct window *w) | |||
| 4905 | * window_wants_header_line: | 4905 | * window_wants_header_line: |
| 4906 | * | 4906 | * |
| 4907 | * Return 1 if window W wants a header line and is high enough to | 4907 | * Return 1 if window W wants a header line and is high enough to |
| 4908 | * accomodate it, 0 otherwise. | 4908 | * accommodate it, 0 otherwise. |
| 4909 | * | 4909 | * |
| 4910 | * W wants a header line if it's a leaf window and neither a minibuffer | 4910 | * W wants a header line if it's a leaf window and neither a minibuffer |
| 4911 | * nor a pseudo window. Moreover, its 'window-mode-line-format' | 4911 | * nor a pseudo window. Moreover, its 'window-mode-line-format' |
| 4912 | * parameter must not be 'none' and either that parameter or W's | 4912 | * parameter must not be 'none' and either that parameter or W's |
| 4913 | * buffer's 'mode-line-format' value must be non-nil. Finally, W must | 4913 | * buffer's 'mode-line-format' value must be non-nil. Finally, W must |
| 4914 | * be higher than its frame's canonical character height and be able to | 4914 | * be higher than its frame's canonical character height and be able to |
| 4915 | * accomodate a mode line too if necessary (the mode line prevails). | 4915 | * accommodate a mode line too if necessary (the mode line prevails). |
| 4916 | */ | 4916 | */ |
| 4917 | bool | 4917 | bool |
| 4918 | window_wants_header_line (struct window *w) | 4918 | window_wants_header_line (struct window *w) |
diff --git a/src/xdisp.c b/src/xdisp.c index 8bc5d81f448..1c316fa4932 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -16431,9 +16431,6 @@ redisplay_window (Lisp_Object window, bool just_this_one_p) | |||
| 16431 | eassert (XMARKER (w->start)->buffer == buffer); | 16431 | eassert (XMARKER (w->start)->buffer == buffer); |
| 16432 | eassert (XMARKER (w->pointm)->buffer == buffer); | 16432 | eassert (XMARKER (w->pointm)->buffer == buffer); |
| 16433 | 16433 | ||
| 16434 | /* We come here again if we need to run window-text-change-functions | ||
| 16435 | below. */ | ||
| 16436 | restart: | ||
| 16437 | reconsider_clip_changes (w); | 16434 | reconsider_clip_changes (w); |
| 16438 | frame_line_height = default_line_pixel_height (w); | 16435 | frame_line_height = default_line_pixel_height (w); |
| 16439 | margin = window_scroll_margin (w, MARGIN_IN_LINES); | 16436 | margin = window_scroll_margin (w, MARGIN_IN_LINES); |
| @@ -16500,16 +16497,6 @@ redisplay_window (Lisp_Object window, bool just_this_one_p) | |||
| 16500 | && !window_outdated (w) | 16497 | && !window_outdated (w) |
| 16501 | && !hscrolling_current_line_p (w)); | 16498 | && !hscrolling_current_line_p (w)); |
| 16502 | 16499 | ||
| 16503 | /* Run the window-text-change-functions | ||
| 16504 | if it is possible that the text on the screen has changed | ||
| 16505 | (either due to modification of the text, or any other reason). */ | ||
| 16506 | if (!current_matrix_up_to_date_p | ||
| 16507 | && !NILP (Vwindow_text_change_functions)) | ||
| 16508 | { | ||
| 16509 | safe_run_hooks (Qwindow_text_change_functions); | ||
| 16510 | goto restart; | ||
| 16511 | } | ||
| 16512 | |||
| 16513 | beg_unchanged = BEG_UNCHANGED; | 16500 | beg_unchanged = BEG_UNCHANGED; |
| 16514 | end_unchanged = END_UNCHANGED; | 16501 | end_unchanged = END_UNCHANGED; |
| 16515 | 16502 | ||
| @@ -31692,7 +31679,6 @@ They are still logged to the *Messages* buffer. */); | |||
| 31692 | DEFSYM (Qoverriding_terminal_local_map, "overriding-terminal-local-map"); | 31679 | DEFSYM (Qoverriding_terminal_local_map, "overriding-terminal-local-map"); |
| 31693 | DEFSYM (Qoverriding_local_map, "overriding-local-map"); | 31680 | DEFSYM (Qoverriding_local_map, "overriding-local-map"); |
| 31694 | DEFSYM (Qwindow_scroll_functions, "window-scroll-functions"); | 31681 | DEFSYM (Qwindow_scroll_functions, "window-scroll-functions"); |
| 31695 | DEFSYM (Qwindow_text_change_functions, "window-text-change-functions"); | ||
| 31696 | DEFSYM (Qredisplay_end_trigger_functions, "redisplay-end-trigger-functions"); | 31682 | DEFSYM (Qredisplay_end_trigger_functions, "redisplay-end-trigger-functions"); |
| 31697 | DEFSYM (Qinhibit_point_motion_hooks, "inhibit-point-motion-hooks"); | 31683 | DEFSYM (Qinhibit_point_motion_hooks, "inhibit-point-motion-hooks"); |
| 31698 | DEFSYM (Qeval, "eval"); | 31684 | DEFSYM (Qeval, "eval"); |
| @@ -32016,11 +32002,6 @@ is scrolled. It is not designed for that, and such use probably won't | |||
| 32016 | work. */); | 32002 | work. */); |
| 32017 | Vwindow_scroll_functions = Qnil; | 32003 | Vwindow_scroll_functions = Qnil; |
| 32018 | 32004 | ||
| 32019 | DEFVAR_LISP ("window-text-change-functions", | ||
| 32020 | Vwindow_text_change_functions, | ||
| 32021 | doc: /* Functions to call in redisplay when text in the window might change. */); | ||
| 32022 | Vwindow_text_change_functions = Qnil; | ||
| 32023 | |||
| 32024 | DEFVAR_LISP ("redisplay-end-trigger-functions", Vredisplay_end_trigger_functions, | 32005 | DEFVAR_LISP ("redisplay-end-trigger-functions", Vredisplay_end_trigger_functions, |
| 32025 | doc: /* Functions called when redisplay of a window reaches the end trigger. | 32006 | doc: /* Functions called when redisplay of a window reaches the end trigger. |
| 32026 | Each function is called with two arguments, the window and the end trigger value. | 32007 | Each function is called with two arguments, the window and the end trigger value. |