diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-07-12 17:52:57 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-07-12 17:52:57 +0200 |
| commit | fe6f18687761403470979feef8fe8ce582ae3b60 (patch) | |
| tree | d5f5ebb7d4a362c89d908515f70efafb9397f803 /src | |
| parent | 1db43b1145fe466b5d41af6744a08083983de3a9 (diff) | |
| download | vim-git-fe6f18687761403470979feef8fe8ce582ae3b60.tar.gz | |
patch 7.4.781v7.4.781
Problem: line2byte() returns one less when 'bin' and 'noeol' are set.
Solution: Only adjust the size for the last line. (Rob Wu)
Diffstat (limited to 'src')
| -rw-r--r-- | src/memline.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/memline.c b/src/memline.c index e80936087..91ef270bc 100644 --- a/src/memline.c +++ b/src/memline.c @@ -5362,7 +5362,7 @@ ml_find_line_or_offset(buf, lnum, offp) size += lnum - 1; /* Don't count the last line break if 'bin' and 'noeol'. */ - if (buf->b_p_bin && !buf->b_p_eol) + if (buf->b_p_bin && !buf->b_p_eol && buf->b_ml.ml_line_count == lnum) size -= ffdos + 1; } diff --git a/src/version.c b/src/version.c index c9691dd81..e5f2887be 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 781, +/**/ 780, /**/ 779, |