commit 79a213d6a4e909703524a7f1ad985c7bd40650a6
author Bram Moolenaar <Bram@vim.org> Tue May 16 13:15:18 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Tue May 16 13:15:18 2017 +0200
tree 0bfee87d433fa76ec2ec876c402f97ebc2bc8006
parent 9e0f6ec0762575d229b86798b284ca4876bc3d73

patch 8.0.0599: diff mode is insufficiently tested

Problem:    diff mode is insufficiently tested
Solution:   Add more test cases. (Dominique Pelle, closes #1685)

src/diff.c

diff --git a/src/diff.c b/src/diff.c
index 246c4e0..dfc968f 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1244,7 +1244,8 @@
 		    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;