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

updated for version 7.4.031

Browse Source 
Problem:    ":diffoff!" resets options even when 'diff' is not set. (Charles
            Cooper)
Solution:   Only resets related options in a window where 'diff' is set.
This commit is contained in:
Bram Moolenaar
2013-09-20 20:13:53 +02:00
parent 9952c102dd
commit 00462ffb7d
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/diff.c
View File

@@ -1203,7 +1203,7 @@ ex_diffoff(eap)
for (wp = firstwin; wp != NULL; wp = wp->w_next) for (wp = firstwin; wp != NULL; wp = wp->w_next)
{ {
if (wp == curwin || (eap->forceit && wp->w_p_diff)) if (eap->forceit ? wp->w_p_diff : wp == curwin)
{ {
/* Set 'diff', 'scrollbind' off and 'wrap' on. If option values /* Set 'diff', 'scrollbind' off and 'wrap' on. If option values
* were saved in diff_win_options() restore them. */ * were saved in diff_win_options() restore them. */

2
src/version.c
View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
31,
/**/ /**/
30, 30,
/**/ /**/