diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-05-16 13:15:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-05-16 13:15:18 +0200 |
| commit | 79a213d6a4e909703524a7f1ad985c7bd40650a6 (patch) | |
| tree | 0bfee87d433fa76ec2ec876c402f97ebc2bc8006 /src/diff.c | |
| parent | 9e0f6ec0762575d229b86798b284ca4876bc3d73 (diff) | |
| download | vim-git-79a213d6a4e909703524a7f1ad985c7bd40650a6.tar.gz | |
patch 8.0.0599: diff mode is insufficiently testedv8.0.0599
Problem: diff mode is insufficiently tested
Solution: Add more test cases. (Dominique Pelle, closes #1685)
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/diff.c b/src/diff.c index 246c4e09e..dfc968f83 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1244,7 +1244,8 @@ ex_diffoff(exarg_T *eap) wp->w_p_wrap = wp->w_p_wrap_save; #ifdef FEAT_FOLDING free_string_option(wp->w_p_fdm); - wp->w_p_fdm = vim_strsave(wp->w_p_fdm_save); + wp->w_p_fdm = vim_strsave( + *wp->w_p_fdm_save ? wp->w_p_fdm_save : (char_u*)"manual"); if (wp->w_p_fdc == diff_foldcolumn) wp->w_p_fdc = wp->w_p_fdc_save; |