aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/option.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2020-03-01 23:23:50 -0800
committerGitHub <noreply@github.com>2020-03-01 23:23:50 -0800
commit0110735547bc5a491eff195096ba93e3ddefb19f (patch)
treeaad45b055941ef137d86494b534a7b53e5ac38ec /src/nvim/option.c
parent5e0c435ca1b711e80f78429431b4d400d789c618 (diff)
parentf1923d4b92239ef2ca280bf1ce6c5f6cc7cb4f1a (diff)
downloadrneovim-0110735547bc5a491eff195096ba93e3ddefb19f.tar.gz
rneovim-0110735547bc5a491eff195096ba93e3ddefb19f.tar.bz2
rneovim-0110735547bc5a491eff195096ba93e3ddefb19f.zip
Merge #11929 from janlazo/vim-8.1.1510
vim-patch:8.0.1587,8.1.{253,881,883,885,896,939,1107,1108,1466,1489,1510,1552,1642,1793},8.2.{108,133,135}
Diffstat (limited to 'src/nvim/option.c')
-rw-r--r--src/nvim/option.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 478c9a0ff8..5f1c73480e 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -6073,10 +6073,8 @@ void buf_copy_options(buf_T *buf, int flags)
save_p_isk = buf->b_p_isk;
buf->b_p_isk = NULL;
}
- /*
- * Always free the allocated strings.
- * If not already initialized, set 'readonly' and copy 'fileformat'.
- */
+ // Always free the allocated strings. If not already initialized,
+ // reset 'readonly' and copy 'fileformat'.
if (!buf->b_p_initialized) {
free_buf_options(buf, true);
buf->b_p_ro = false; // don't copy readonly