comparison src/move.c @ 30205:ed6f3d2593df v9.0.0438

patch 9.0.0438: cannot put virtual text above a line Commit: https://github.com/vim/vim/commit/04e0ed1ddf399d609dbcb7dbf19e531da1fe6172 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Sep 10 20:00:56 2022 +0100 patch 9.0.0438: cannot put virtual text above a line Problem: Cannot put virtual text above a line. Solution: Add the "above" value for "text_align".
author Bram Moolenaar <Bram@vim.org>
date Sat, 10 Sep 2022 21:15:03 +0200
parents 89e1d67814a9
children bc8ad1c28b51
comparison
equal deleted inserted replaced
30204:b6c11bb32c89 30205:ed6f3d2593df
474 update_curswant(void) 474 update_curswant(void)
475 { 475 {
476 if (curwin->w_set_curswant) 476 if (curwin->w_set_curswant)
477 { 477 {
478 validate_virtcol(); 478 validate_virtcol();
479 curwin->w_curswant = curwin->w_virtcol; 479 curwin->w_curswant = curwin->w_virtcol
480 #ifdef FEAT_PROP_POPUP
481 - curwin->w_virtcol_first_char
482 #endif
483 ;
480 curwin->w_set_curswant = FALSE; 484 curwin->w_set_curswant = FALSE;
481 } 485 }
482 } 486 }
483 487
484 /* 488 /*
833 validate_virtcol_win(win_T *wp) 837 validate_virtcol_win(win_T *wp)
834 { 838 {
835 check_cursor_moved(wp); 839 check_cursor_moved(wp);
836 if (!(wp->w_valid & VALID_VIRTCOL)) 840 if (!(wp->w_valid & VALID_VIRTCOL))
837 { 841 {
842 #ifdef FEAT_PROP_POPUP
843 wp->w_virtcol_first_char = 0;
844 #endif
838 getvvcol(wp, &wp->w_cursor, NULL, &(wp->w_virtcol), NULL); 845 getvvcol(wp, &wp->w_cursor, NULL, &(wp->w_virtcol), NULL);
839 #ifdef FEAT_SYN_HL 846 #ifdef FEAT_SYN_HL
840 redraw_for_cursorcolumn(wp); 847 redraw_for_cursorcolumn(wp);
841 #endif 848 #endif
842 wp->w_valid |= VALID_VIRTCOL; 849 wp->w_valid |= VALID_VIRTCOL;
979 /* 986 /*
980 * Next make sure that w_cline_row is valid. 987 * Next make sure that w_cline_row is valid.
981 */ 988 */
982 if (!(curwin->w_valid & VALID_CROW)) 989 if (!(curwin->w_valid & VALID_CROW))
983 curs_rows(curwin); 990 curs_rows(curwin);
991
992 #ifdef FEAT_PROP_POPUP
993 // will be set by getvvcol() but not reset
994 curwin->w_virtcol_first_char = 0;
995 #endif
984 996
985 /* 997 /*
986 * Compute the number of virtual columns. 998 * Compute the number of virtual columns.
987 */ 999 */
988 #ifdef FEAT_FOLDING 1000 #ifdef FEAT_FOLDING