aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/diff.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2015-01-22 22:20:29 -0800
committerJustin M. Keyes <justinkz@gmail.com>2015-01-22 22:20:29 -0800
commit0f39097e5348ae61dbf9a226ffde3bca6b75d659 (patch)
tree78f2aaf4f7e3af413adf61b95307ef1197056d25 /src/nvim/diff.c
parent918b5d021d9ece1da76b0bd61ddefe32ba401c89 (diff)
parent19c22cdb80e30711be5af33cb6726566ad629944 (diff)
downloadrneovim-0f39097e5348ae61dbf9a226ffde3bca6b75d659.tar.gz
rneovim-0f39097e5348ae61dbf9a226ffde3bca6b75d659.tar.bz2
rneovim-0f39097e5348ae61dbf9a226ffde3bca6b75d659.zip
Merge pull request #1850 from JackDanger/halfway-a-line
doc: "halfway a line" is a very confusing phrase
Diffstat (limited to 'src/nvim/diff.c')
-rw-r--r--src/nvim/diff.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index b8fa3c24a2..35c00c4f23 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -1084,7 +1084,7 @@ void diff_win_options(win_T *wp, int addbuf)
wp->w_p_fdl = 0;
foldUpdateAll(wp);
- // make sure topline is not halfway a fold
+ // make sure topline is not halfway through a fold
changed_window_setting_win(wp);
if (vim_strchr(p_sbo, 'h') == NULL) {
do_cmdline_cmd((char_u *)"set sbo+=hor");
@@ -1160,7 +1160,7 @@ void ex_diffoff(exarg_T *eap)
foldUpdateAll(wp);
- // make sure topline is not halfway a fold
+ // make sure topline is not halfway through a fold
changed_window_setting_win(wp);
// Note: 'sbo' is not restored, it's a global option.
@@ -1511,8 +1511,8 @@ int diff_check(win_T *wp, linenr_T lnum)
// If there is no buffer with zero lines then there is no difference
// any longer. Happens when making a change (or undo) that removes
// the difference. Can't remove the entry here, we might be halfway
- // updating the window. Just report the text as unchanged. Other
- // windows might still show the change though.
+ // through updating the window. Just report the text as unchanged.
+ // Other windows might still show the change though.
if (zero == FALSE) {
return 0;
}