Mercurial > vim
comparison src/move.c @ 30231:0d084880276a v9.0.0451
patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Commit: https://github.com/vim/vim/commit/c9dc03fff5acf6fb91a923fb95006f9c2bca6141
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Sep 12 17:51:07 2022 +0100
patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Problem: Virtual text "above" does not work with 'nowrap'.
Solution: Do wrap the line after. (closes https://github.com/vim/vim/issues/11084)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 12 Sep 2022 19:00:05 +0200 |
parents | bc8ad1c28b51 |
children | 914b3c64ab92 |
comparison
equal
deleted
inserted
replaced
30230:aad84f731ef9 | 30231:0d084880276a |
---|---|
1066 #ifdef FEAT_FOLDING | 1066 #ifdef FEAT_FOLDING |
1067 && !curwin->w_cline_folded | 1067 && !curwin->w_cline_folded |
1068 #endif | 1068 #endif |
1069 ) | 1069 ) |
1070 { | 1070 { |
1071 #ifdef FEAT_PROP_POPUP | |
1072 if (curwin->w_virtcol_first_char > 0) | |
1073 { | |
1074 int cols = (curwin->w_width - extra); | |
1075 int rows = cols > 0 ? curwin->w_virtcol_first_char / cols : 1; | |
1076 | |
1077 // each "above" text prop shifts the text one row down | |
1078 curwin->w_wrow += rows; | |
1079 curwin->w_wcol -= rows * cols; | |
1080 endcol -= rows * cols; | |
1081 curwin->w_cline_height = rows + 1; | |
1082 } | |
1083 #endif | |
1071 /* | 1084 /* |
1072 * If Cursor is left of the screen, scroll rightwards. | 1085 * If Cursor is left of the screen, scroll rightwards. |
1073 * If Cursor is right of the screen, scroll leftwards | 1086 * If Cursor is right of the screen, scroll leftwards |
1074 * If we get closer to the edge than 'sidescrolloff', scroll a little | 1087 * If we get closer to the edge than 'sidescrolloff', scroll a little |
1075 * extra | 1088 * extra |