updated for version 7.2.357

Problem:    When changing 'fileformat' from/to "mac" and there is a CR in the
            text the display is wrong.
Solution:   Redraw the text when 'fileformat' is changed. (Ben Schmidt)

diff --git a/src/option.c b/src/option.c
index 491a8d8e38362174cccab7947b80753190905742..99e94d5e0d598f5bc835560c3e2c16aaaa7bdde0 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -5867,6 +5867,10 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
 #endif
            /* update flag in swap file */
            ml_setflags(curbuf);
+           /* Redraw needed when switching to/from "mac": a CR in the text
+            * will be displayed differently. */
+           if (get_fileformat(curbuf) == EOL_MAC || *oldval == 'm')
+               redraw_curbuf_later(NOT_VALID);
        }
     }
 

diff --git a/src/version.c b/src/version.c
index b7aacc130a0c74d6bad75dcdf097b872f5664adf..b83d0b61d29ab280eadc6eb18d1a445b90f7ab0d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    357,
 /**/
     356,
 /**/