summaryrefslogtreecommitdiff
path: root/src/netbeans.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-07-17 14:18:08 +0200
committerBram Moolenaar <Bram@vim.org>2015-07-17 14:18:08 +0200
commit34d72d4b6c1a2b04a214d8a49b7d22c97bc7a8bc (patch)
tree82675f2f5f49bcb04e8271de9fefee41b3c2ec19 /src/netbeans.c
parent2cf6938706ebcd20e4b4a6723f5f70568b26b1c6 (diff)
downloadvim-git-34d72d4b6c1a2b04a214d8a49b7d22c97bc7a8bc.tar.gz
patch 7.4.785v7.4.785
Problem: On some systems automatically adding the missing EOL causes problems. Setting 'binary' has too many side effects. Solution: Add the 'fixeol' option, default on. (Pavel Samarkin)
Diffstat (limited to 'src/netbeans.c')
-rw-r--r--src/netbeans.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/netbeans.c b/src/netbeans.c
index 68ca301d0..ea0c017ad 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -3802,7 +3802,7 @@ get_buf_size(buf_T *bufp)
}
}
/* Correction for when last line doesn't have an EOL. */
- if (!bufp->b_p_eol && bufp->b_p_bin)
+ if (!bufp->b_p_eol && (bufp->b_p_bin || !bufp->b_p_fixeol))
char_count -= eol_size;
}