summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-02-11 17:02:11 +0100
committerBram Moolenaar <Bram@vim.org>2010-02-11 17:02:11 +0100
commit0413d48711cee4f3b70a097652e502009dc744b4 (patch)
tree0f3a214be7ce82eab2c8e4572ae8188e3b87493e
parent6dfc28be25dc1e4323b6652fa517e972007ff1bd (diff)
updated for version 7.2.357v7.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)
-rw-r--r--src/option.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index 491a8d8e38..99e94d5e0d 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 b7aacc130a..b83d0b61d2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 357,
+/**/
356,
/**/
355,