updated for version 7.4.031

Problem:    ":diffoff!" resets options even when 'diff' is not set. (Charles
            Cooper)
Solution:   Only resets related options in a window where 'diff' is set.

diff --git a/src/diff.c b/src/diff.c
index 80f447314432703aec33f8550429e69033d011a6..49ca58af7c3016315fadbd79a28448e0419f097e 100644 (file)
--- a/src/diff.c
+++ b/src/diff.c
@@ -1203,7 +1203,7 @@ ex_diffoff(eap)
 
     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
             * were saved in diff_win_options() restore them. */

diff --git a/src/version.c b/src/version.c
index 272940af8d3446d3f4495e7dd0451cedb94223c2..b07e26962bee58a5b3d717b83e6a3cd636c2c4cf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    31,
 /**/
     30,
 /**/