From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 11 Feb 2010 16:02:11 +0000 (+0100)
Subject: updated for version 7.2.357
X-Git-Tag: v7.2.357
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0413d48711cee4f3b70a097652e502009dc744b4;p=vim

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 491a8d8e3..99e94d5e0 100644
--- 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 b7aacc130..b83d0b61d 100644
--- 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,
 /**/