diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-01-21 10:09:04 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-01-21 12:21:47 +0100 |
| commit | 9c92eed86f99fa4f423228a5afd0ef8eac9894e3 (patch) | |
| tree | e2c684e33d89eb50f0b8bf83c70144e30be3ed84 /src/nvim/diff.c | |
| parent | 9db4dc971dd9357c57dbfeae3ec535033c38743b (diff) | |
| download | rneovim-9c92eed86f99fa4f423228a5afd0ef8eac9894e3.tar.gz rneovim-9c92eed86f99fa4f423228a5afd0ef8eac9894e3.tar.bz2 rneovim-9c92eed86f99fa4f423228a5afd0ef8eac9894e3.zip | |
vim-patch:8.0.0599: diff mode is insufficiently tested
Problem: diff mode is insufficiently tested
Solution: Add more test cases. (Dominique Pelle, closes vim/vim#1685)
https://github.com/vim/vim/commit/79a213d6a4e909703524a7f1ad985c7bd40650a6
NA / already applied:
---------------------
vim-patch:8.0.0421: diff mode wrong when adding line at end of buffer
Problem: Diff mode is displayed wrong when adding a line at the end of a
buffer.
Solution: Adjust marks in diff mode. (James McCoy, closes vim/vim#1329)
https://github.com/vim/vim/commit/f58a8475e17bd566760fc7e2a17d35ddf4edacf2
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index cc0f3b2629..dd489c18e9 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -1161,7 +1161,9 @@ void ex_diffoff(exarg_T *eap) } 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; } |