aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johanhelsing@gmail.com>2015-10-14 21:26:50 +0200
committerJohan Klokkhammer Helsing <johanhelsing@gmail.com>2015-11-22 20:03:41 +0100
commit8d07058097fe2f36848e16aae6176fc045316371 (patch)
tree8835f0661138237c77c04ec3f879d86aa15ad974
parentb1d7b5294aa057faae6f0fdddc55ad2e36c3ea97 (diff)
downloadrneovim-8d07058097fe2f36848e16aae6176fc045316371.tar.gz
rneovim-8d07058097fe2f36848e16aae6176fc045316371.tar.bz2
rneovim-8d07058097fe2f36848e16aae6176fc045316371.zip
vim-patch:7.4.795
Problem: The 'fixeol' option is not copied to a new window. Solution: Copy the option value. (Yasuhiro Matsumoto) https://github.com/vim/vim/commit/b388be0abf04bba744f390587e8293bfbb1708a4
-rw-r--r--src/nvim/option.c1
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 95045ac64b..6721a5c604 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -5479,6 +5479,7 @@ void buf_copy_options(buf_T *buf, int flags)
buf->b_p_bin = p_bin;
buf->b_p_bomb = p_bomb;
buf->b_p_et = p_et;
+ buf->b_p_fixeol = p_fixeol;
buf->b_p_et_nobin = p_et_nobin;
buf->b_p_ml = p_ml;
buf->b_p_ml_nobin = p_ml_nobin;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index f4c181291c..f1d2028269 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -201,7 +201,7 @@ static int included_patches[] = {
// 798,
// 797,
// 796 NA
- // 795,
+ 795,
// 794 NA
793,
// 792,