diff options
| author | Will Stamper <epmatsw@gmail.com> | 2014-06-12 20:47:05 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-07-11 16:38:49 -0400 |
| commit | fdeb132cad2b1fe409376c047f5899c38e79aaaa (patch) | |
| tree | 019db7df8ac4ae55ed29dad76ee0e1fc3f81577c /src | |
| parent | 3e8314abaa7318705491d2cec81d6054313d80c4 (diff) | |
| download | rneovim-fdeb132cad2b1fe409376c047f5899c38e79aaaa.tar.gz rneovim-fdeb132cad2b1fe409376c047f5899c38e79aaaa.tar.bz2 rneovim-fdeb132cad2b1fe409376c047f5899c38e79aaaa.zip | |
vim-patch:7.4.295 #833
Problem: Various typos, bad white space and unclear comments.
Solution: Fix typos. Improve white space. Update comments.
https://code.google.com/p/vim/source/detail?r=662ae48e7e246a63d38c9f3165b15b62252edaee
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/macros.h | 2 | ||||
| -rw-r--r-- | src/nvim/os_unix.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test49.in | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/macros.h b/src/nvim/macros.h index c8586efe63..93ae72987c 100644 --- a/src/nvim/macros.h +++ b/src/nvim/macros.h @@ -135,7 +135,7 @@ /* Advance multi-byte pointer, do not skip over composing chars. */ # define mb_cptr_adv(p) p += \ enc_utf8 ? utf_ptr2len(p) : has_mbyte ? (*mb_ptr2len)(p) : 1 -/* Backup multi-byte pointer. */ +/* Backup multi-byte pointer. Only use with "p" > "s" ! */ # define mb_ptr_back(s, p) p -= has_mbyte ? ((*mb_head_off)(s, p - 1) + 1) : 1 /* get length of multi-byte char, not including composing chars */ # define mb_cptr2len(p) (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p)) diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index 31653960ef..3e677a1379 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -837,7 +837,7 @@ void check_mouse_termcode() } } else del_mouse_termcode(KS_URXVT_MOUSE); - /* same as the dec mouse */ + /* There is no conflict with xterm mouse */ if (use_xterm_mouse() == 4 ) { set_mouse_termcode(KS_SGR_MOUSE, (char_u *)(term_is_8bit(T_NAME) diff --git a/src/nvim/testdir/test49.in b/src/nvim/testdir/test49.in index bd6cb4cad7..5e1d6b461e 100644 --- a/src/nvim/testdir/test49.in +++ b/src/nvim/testdir/test49.in @@ -1,7 +1,7 @@ This is a test of the script language. If after adding a new test, the test output doesn't appear properly in -test49.failed, try to add one ore more "G"s at the line ending in "test.out" +test49.failed, try to add one or more "G"s at the line ending in "test.out" STARTTEST :so small.vim diff --git a/src/nvim/version.c b/src/nvim/version.c index b23d29c82f..f1ce7f6ab2 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -223,7 +223,7 @@ static int included_patches[] = { 298, //297, //296, - //295, + 295, //294, //293, 292, |