Adjust marks when adding a new line to the end of buffer if in diff mode #1329
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
In 7.4.1896, guards were added around specific mark_adjust() calls to avoid updating marks if a new line was being added to the end of the buffer. However, this breaks updating the state of windows in 'diffmode' when a buffer is changed in that manner, leading to incorrect diff views.
chrisbra
pushed a commit
to chrisbra/vim
that referenced
this pull request
Mar 25, 2017
Problem: Diff mode is displayed wrong when adding a line at the end of a
buffer.
Solution: Adjust marks in diff mode. (James McCoy, closes vim#1329)
desvp
pushed a commit
to desvp/vim
that referenced
this pull request
May 30, 2017
Problem: Diff mode is displayed wrong when adding a line at the end of a
buffer.
Solution: Adjust marks in diff mode. (James McCoy, closes vim#1329)
justinmk
added a commit
to justinmk/neovim
that referenced
this pull request
Jan 21, 2018
Problem: diff mode is insufficiently tested Solution: Add more test cases. (Dominique Pelle, closes vim/vim#1685) vim/vim@79a213d NA / already applied: --------------------- vim-patch:8.0.0421: diff mode wrong when adding line at end of buffer Problem: Diff mode is displayed wrong when adding a line at the end of a buffer. Solution: Adjust marks in diff mode. (James McCoy, closes vim/vim#1329) vim/vim@f58a847
justinmk
added a commit
to justinmk/neovim
that referenced
this pull request
Jan 21, 2018
Problem: diff mode is insufficiently tested Solution: Add more test cases. (Dominique Pelle, closes vim/vim#1685) vim/vim@79a213d NA / already applied: --------------------- vim-patch:8.0.0421: diff mode wrong when adding line at end of buffer Problem: Diff mode is displayed wrong when adding a line at the end of a buffer. Solution: Adjust marks in diff mode. (James McCoy, closes vim/vim#1329) vim/vim@f58a847
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
In 7.4.1896, guards were added around specific mark_adjust() calls to
avoid updating marks if a new line was being added to the end of the
buffer. However, this breaks updating the state of windows in
'diffmode' when a buffer is changed in that manner, leading to incorrect
diff views.