Mercurial > vim

diff src/diff.c @ 11430:eba1a8c6e21d v8.0.0599

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0599: diff mode is insufficiently tested commit https://github.com/vim/vim/commit/79a213d6a4e909703524a7f1ad985c7bd40650a6 Author: Bram Moolenaar <Bram@vim.org> Date: Tue May 16 13:15:18 2017 +0200 patch 8.0.0599: diff mode is insufficiently tested Problem: diff mode is insufficiently tested Solution: Add more test cases. (Dominique Pelle, closes https://github.com/vim/vim/issues/1685)
author Christian Brabandt <cb@256bit.org>
date Tue, 16 May 2017 13:30:04 +0200
parents f4ea50924c6d
children 1395a3b6978d
line wrap: on
line diff
--- 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;