Mercurial > vim
diff src/memline.c @ 20:4ac1dce8dd5e v7.0012
updated for version 7.0012
author | vimboss |
---|---|
date | Mon, 26 Jul 2004 12:53:41 +0000 |
parents | 24d5189d3956 |
children | 7f788cd27415 |
line wrap: on
line diff
--- a/src/memline.c +++ b/src/memline.c @@ -4338,8 +4338,17 @@ ml_find_line_or_offset(buf, line, offp) curline = buf->b_ml.ml_locked_high + 1; } - if (ffdos) - size += line - 1; + if (line != 0) + { + /* Count extra CR characters. */ + if (ffdos) + size += line - 1; + + /* Don't count the last line break if 'bin' and 'noeol'. */ + if (buf->b_p_bin && !buf->b_p_eol) + size -= ffdos + 1; + } + return size; }