mirror of
https://github.com/neovim/neovim.git
synced 2025-09-29 14:38:32 +00:00
vim-patch:8.2.4911: the mode #defines are not clearly named (#18499)
Problem: The mode #defines are not clearly named.
Solution: Prepend MODE_. Renumber them to put the mapped modes first.
249591057b
A hunk from the patch depends on patch 8.2.4861, which hasn't been
ported yet, but that should be easy to notice.
This commit is contained in:
@@ -775,7 +775,7 @@ void clearFolding(win_T *win)
|
||||
/// The changes in lines from top to bot (inclusive).
|
||||
void foldUpdate(win_T *wp, linenr_T top, linenr_T bot)
|
||||
{
|
||||
if (compl_busy || State & INSERT) {
|
||||
if (compl_busy || State & MODE_INSERT) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1374,7 +1374,7 @@ void foldMarkAdjust(win_T *wp, linenr_T line1, linenr_T line2, long amount, long
|
||||
}
|
||||
// If appending a line in Insert mode, it should be included in the fold
|
||||
// just above the line.
|
||||
if ((State & INSERT) && amount == (linenr_T)1 && line2 == MAXLNUM) {
|
||||
if ((State & MODE_INSERT) && amount == (linenr_T)1 && line2 == MAXLNUM) {
|
||||
line1--;
|
||||
}
|
||||
foldMarkAdjustRecurse(wp, &wp->w_folds, line1, line2, amount, amount_after);
|
||||
@@ -1394,7 +1394,7 @@ static void foldMarkAdjustRecurse(win_T *wp, garray_T *gap, linenr_T line1, line
|
||||
|
||||
// In Insert mode an inserted line at the top of a fold is considered part
|
||||
// of the fold, otherwise it isn't.
|
||||
if ((State & INSERT) && amount == (linenr_T)1 && line2 == MAXLNUM) {
|
||||
if ((State & MODE_INSERT) && amount == (linenr_T)1 && line2 == MAXLNUM) {
|
||||
top = line1 + 1;
|
||||
} else {
|
||||
top = line1;
|
||||
|
Reference in New Issue
Block a user