Mercurial > vim
comparison src/drawscreen.c @ 18763:49b78d6465e5 v8.1.2371
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Commit: https://github.com/vim/vim/commit/05ad5ff0ab34ed9a5296dedd420ca81698b8ce22
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 30 22:48:27 2019 +0100
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Problem: FEAT_TEXT_PROP is a confusing name.
Solution: Use FEAT_PROP_POPUP. (Naruhiko Nishino, closes https://github.com/vim/vim/issues/5291)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 30 Nov 2019 23:00:05 +0100 |
parents | e4b03b369c41 |
children | 5c405689da3e |
comparison
equal
deleted
inserted
replaced
18762:19582783e5ad | 18763:49b78d6465e5 |
---|---|
147 curwin->w_lines_valid = 0; // don't use w_lines[].wl_size now | 147 curwin->w_lines_valid = 0; // don't use w_lines[].wl_size now |
148 return FAIL; | 148 return FAIL; |
149 } | 149 } |
150 updating_screen = TRUE; | 150 updating_screen = TRUE; |
151 | 151 |
152 #ifdef FEAT_TEXT_PROP | 152 #ifdef FEAT_PROP_POPUP |
153 // Update popup_mask if needed. This may set w_redraw_top and w_redraw_bot | 153 // Update popup_mask if needed. This may set w_redraw_top and w_redraw_bot |
154 // in some windows. | 154 // in some windows. |
155 may_update_popup_mask(type); | 155 may_update_popup_mask(type); |
156 #endif | 156 #endif |
157 | 157 |
333 // Reset b_mod_set flags. Going through all windows is probably faster | 333 // Reset b_mod_set flags. Going through all windows is probably faster |
334 // than going through all buffers (there could be many buffers). | 334 // than going through all buffers (there could be many buffers). |
335 FOR_ALL_WINDOWS(wp) | 335 FOR_ALL_WINDOWS(wp) |
336 wp->w_buffer->b_mod_set = FALSE; | 336 wp->w_buffer->b_mod_set = FALSE; |
337 | 337 |
338 #ifdef FEAT_TEXT_PROP | 338 #ifdef FEAT_PROP_POPUP |
339 // Display popup windows on top of the windows and command line. | 339 // Display popup windows on top of the windows and command line. |
340 update_popups(win_update); | 340 update_popups(win_update); |
341 #endif | 341 #endif |
342 | 342 |
343 after_updating_screen(TRUE); | 343 after_updating_screen(TRUE); |
2474 // Window ends in filler lines. | 2474 // Window ends in filler lines. |
2475 wp->w_botline = lnum; | 2475 wp->w_botline = lnum; |
2476 wp->w_filler_rows = wp->w_height - srow; | 2476 wp->w_filler_rows = wp->w_height - srow; |
2477 } | 2477 } |
2478 #endif | 2478 #endif |
2479 #ifdef FEAT_TEXT_PROP | 2479 #ifdef FEAT_PROP_POPUP |
2480 else if (WIN_IS_POPUP(wp)) | 2480 else if (WIN_IS_POPUP(wp)) |
2481 { | 2481 { |
2482 // popup line that doesn't fit is left as-is | 2482 // popup line that doesn't fit is left as-is |
2483 wp->w_botline = lnum; | 2483 wp->w_botline = lnum; |
2484 } | 2484 } |
2583 #if defined(FEAT_CONCEAL) | 2583 #if defined(FEAT_CONCEAL) |
2584 if (old_wcol != new_wcol && (wp->w_valid & (VALID_WCOL|VALID_WROW)) | 2584 if (old_wcol != new_wcol && (wp->w_valid & (VALID_WCOL|VALID_WROW)) |
2585 != (VALID_WCOL|VALID_WROW)) | 2585 != (VALID_WCOL|VALID_WROW)) |
2586 { | 2586 { |
2587 // A win_line() call applied a fix to screen cursor column to | 2587 // A win_line() call applied a fix to screen cursor column to |
2588 // accomodate concealment of cursor line, but in this call to | 2588 // accommodate concealment of cursor line, but in this call to |
2589 // update_topline() the cursor's row or column got invalidated. | 2589 // update_topline() the cursor's row or column got invalidated. |
2590 // If they are left invalid, setcursor() will recompute them | 2590 // If they are left invalid, setcursor() will recompute them |
2591 // but there won't be any further win_line() call to re-fix the | 2591 // but there won't be any further win_line() call to re-fix the |
2592 // column and the cursor will end up misplaced. So we call | 2592 // column and the cursor will end up misplaced. So we call |
2593 // cursor validation now and reapply the fix again (or call | 2593 // cursor validation now and reapply the fix again (or call |
2645 gui_undraw_cursor(); | 2645 gui_undraw_cursor(); |
2646 #endif | 2646 #endif |
2647 #ifdef FEAT_SEARCH_EXTRA | 2647 #ifdef FEAT_SEARCH_EXTRA |
2648 start_search_hl(); | 2648 start_search_hl(); |
2649 #endif | 2649 #endif |
2650 #ifdef FEAT_TEXT_PROP | 2650 #ifdef FEAT_PROP_POPUP |
2651 // Update popup_mask if needed. | 2651 // Update popup_mask if needed. |
2652 may_update_popup_mask(must_redraw); | 2652 may_update_popup_mask(must_redraw); |
2653 #endif | 2653 #endif |
2654 } | 2654 } |
2655 | 2655 |
2761 || *p_stl != NUL || *wp->w_p_stl != NUL | 2761 || *p_stl != NUL || *wp->w_p_stl != NUL |
2762 # endif | 2762 # endif |
2763 ) | 2763 ) |
2764 win_redr_status(wp, FALSE); | 2764 win_redr_status(wp, FALSE); |
2765 | 2765 |
2766 #ifdef FEAT_TEXT_PROP | 2766 #ifdef FEAT_PROP_POPUP |
2767 // Display popup windows on top of everything. | 2767 // Display popup windows on top of everything. |
2768 update_popups(win_update); | 2768 update_popups(win_update); |
2769 #endif | 2769 #endif |
2770 | 2770 |
2771 update_finish(); | 2771 update_finish(); |