summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-07-22 22:19:38 +0200
committerBram Moolenaar <Bram@vim.org>2015-07-22 22:19:38 +0200
commitb388be0abf04bba744f390587e8293bfbb1708a4 (patch)
treea9a1fb1a7dedadedcb249add0a7edafe5417a618
parentd4a95c3bc5a70f43db0abd020a15d8a1a65db961 (diff)
patch 7.4.795v7.4.795
Problem: The 'fixeol' option is not copied to a new window. Solution: Copy the option value. (Yasuhiro Matsumoto)
-rw-r--r--src/option.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index b0f28d2593..8e5021cd68 100644
--- a/src/option.c
+++ b/src/option.c
@@ -10659,6 +10659,7 @@ buf_copy_options(buf, flags)
#ifdef FEAT_MBYTE
buf->b_p_bomb = p_bomb;
#endif
+ buf->b_p_fixeol = p_fixeol;
buf->b_p_et = p_et;
buf->b_p_et_nobin = p_et_nobin;
buf->b_p_ml = p_ml;
diff --git a/src/version.c b/src/version.c
index a29c9fb95e..7cea9b1aa8 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 */
/**/
+ 795,
+/**/
794,
/**/
793,