mirror of
https://github.com/neovim/neovim.git
synced 2025-09-07 11:58:17 +00:00
vim-patch:8.2.3914 (#16808)
* vim-patch:8.2.3914: various spelling mistakes in comments
Problem: Various spelling mistakes in comments.
Solution: Fix the mistakes. (Dominique Pellé, closes vim/vim#9416)
af4a61a85d
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
This commit is contained in:
@@ -37,8 +37,8 @@
|
||||
#include "nvim/path.h"
|
||||
#include "nvim/screen.h"
|
||||
#include "nvim/strings.h"
|
||||
#include "nvim/undo.h"
|
||||
#include "nvim/ui.h"
|
||||
#include "nvim/undo.h"
|
||||
#include "nvim/vim.h"
|
||||
#include "nvim/window.h"
|
||||
#include "xdiff/xdiff.h"
|
||||
@@ -674,11 +674,11 @@ void diff_redraw(bool dofold)
|
||||
}
|
||||
if (wp_other != NULL && curwin->w_p_scb) {
|
||||
if (used_max_fill_curwin) {
|
||||
// The current window was set to used the maximum number of filler
|
||||
// The current window was set to use the maximum number of filler
|
||||
// lines, may need to reduce them.
|
||||
diff_set_topline(wp_other, curwin);
|
||||
} else if (used_max_fill_other) {
|
||||
// The other window was set to used the maximum number of filler
|
||||
// The other window was set to use the maximum number of filler
|
||||
// lines, may need to reduce them.
|
||||
diff_set_topline(curwin, wp_other);
|
||||
}
|
||||
@@ -1508,7 +1508,7 @@ void ex_diffoff(exarg_T *eap)
|
||||
diff_clear(curtab);
|
||||
}
|
||||
|
||||
// Remove "hor" from from 'scrollopt' if there are no diff windows left.
|
||||
// Remove "hor" from 'scrollopt' if there are no diff windows left.
|
||||
if (!diffwin && (vim_strchr(p_sbo, 'h') != NULL)) {
|
||||
do_cmdline_cmd("set sbo-=hor");
|
||||
}
|
||||
|
Reference in New Issue
Block a user