Mercurial > vim
comparison src/move.c @ 31365:040b59b92dca v9.0.1016
patch 9.0.1016: screenpos() does not count filler lines for diff mode
Commit: https://github.com/vim/vim/commit/1cb16c3a20a9d17df1a8dc3813ef64dc98e42637
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Dec 5 22:26:44 2022 +0000
patch 9.0.1016: screenpos() does not count filler lines for diff mode
Problem: screenpos() does not count filler lines for diff mode.
Solution: Add filler lines. (closes 11658)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 05 Dec 2022 23:30:04 +0100 |
parents | 45a03dd92f28 |
children | 0c0b78aa7ae3 |
comparison
equal
deleted
inserted
replaced
31364:ba81163e2223 | 31365:040b59b92dca |
---|---|
1424 int is_folded; | 1424 int is_folded; |
1425 | 1425 |
1426 is_folded = hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL); | 1426 is_folded = hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL); |
1427 #endif | 1427 #endif |
1428 row = plines_m_win(wp, wp->w_topline, lnum - 1) + 1; | 1428 row = plines_m_win(wp, wp->w_topline, lnum - 1) + 1; |
1429 | |
1430 #ifdef FEAT_DIFF | |
1431 // Add filler lines above this buffer line. | |
1432 row += diff_check_fill(wp, lnum); | |
1433 #endif | |
1434 | |
1429 #ifdef FEAT_FOLDING | 1435 #ifdef FEAT_FOLDING |
1430 if (is_folded) | 1436 if (is_folded) |
1431 { | 1437 { |
1432 row += W_WINROW(wp); | 1438 row += W_WINROW(wp); |
1433 coloff = wp->w_wincol + 1; | 1439 coloff = wp->w_wincol + 1; |