Wrong display with 'smoothscroll' when FEAT_DIFF is disabled #18649
+9
−25
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zeertzjq
force-pushed
the
smoothscroll
branch
from
1a1057d to
ed12707
Compare
zeertzjq
commented
Oct 27, 2025
Comment on lines
-2345
to
+2340
| { | ||
| #ifdef FEAT_DIFF | ||
| if (l == wp->w_topline) | ||
| { | ||
| int n = plines_win_nofill(wp, l, FALSE) | ||
| + wp->w_topfill; | ||
| n -= adjust_plines_for_skipcol(wp); | ||
| if (n > wp->w_height) | ||
| n = wp->w_height; | ||
| new_rows += n; | ||
| } | ||
| else | ||
| #endif | ||
| new_rows += plines_win(wp, l, TRUE); | ||
| } | ||
| new_rows += plines_correct_topline(wp, l, TRUE); |
There was a problem hiding this comment.
The effect of limit_winheight is a bit different when using plines_correct_topline(), but it doesn't matter here, as when line height (including or excluding filler lines) exceeds w_height, the new_rows > wp->w_height - row - 2 condition below will be true, and new_rows will be overwritten.
|
Do you have a test which shows this behaviour? |
|
The existing tests already cover this. Build without FEAT_DIFF and run test_scroll_opt. |
Problem: Wrong display with 'smoothscroll' when FEAT_DIFF is disabled. Solution: Use plines_correct_topline().
zeertzjq
force-pushed
the
smoothscroll
branch
from
ed12707 to
9fbf539
Compare
|
Ah, okay got it. Thanks |
zeertzjq
added a commit
to zeertzjq/neovim
that referenced
this pull request
Oct 28, 2025
Problem: Wrong display with 'smoothscroll' when FEAT_DIFF is disabled. Solution: Use plines_correct_topline() (zeertzjq). closes: vim/vim#18649 vim/vim@e06e70f
zeertzjq
added a commit
to neovim/neovim
that referenced
this pull request
Oct 28, 2025
) Problem: Wrong display with 'smoothscroll' when FEAT_DIFF is disabled. Solution: Use plines_correct_topline() (zeertzjq). closes: vim/vim#18649 vim/vim@e06e70f
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem: Wrong display with 'smoothscroll' when FEAT_DIFF is disabled.
Solution: Use plines_correct_topline().