aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.0.0599: diff mode is insufficiently tested

Browse Source 
Problem:    diff mode is insufficiently tested
Solution:   Add more test cases. (Dominique Pelle, closes #1685)
This commit is contained in:
Bram Moolenaar
2017-05-16 13:15:18 +02:00
parent 9e0f6ec076
commit 79a213d6a4
3 changed files with 190 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/diff.c
View File

@@ -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;