aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/diff.c
diff options
context:
space:
mode:
authorJack Danger Canty <jackdanger@squareup.com>2015-01-19 22:21:14 -0800
committerJack Danger Canty <jackdanger@squareup.com>2015-01-22 21:57:03 -0800
commit19c22cdb80e30711be5af33cb6726566ad629944 (patch)
treee83b3e922b402921da48d721b7b8199b6a0a62f2 /src/nvim/diff.c
parentd550eecf7092397d064df26850d4a09d9ab4a481 (diff)
downloadrneovim-19c22cdb80e30711be5af33cb6726566ad629944.tar.gz
rneovim-19c22cdb80e30711be5af33cb6726566ad629944.tar.bz2
rneovim-19c22cdb80e30711be5af33cb6726566ad629944.zip
"halfway a line" is a very confusing phrase
If you Google for this phrase found in the Vim documentation you'll find almost exclusively hits from the Vim documentation. I think changing "halfway a line" to "halfway through a line" makes more sense. There seems to be an pervasive odd use of the word 'halfway' in the original docs which I'm updating everywhere.
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;
}