summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@zimbu.org>2010-02-11 17:02:11 +0100
committerBram Moolenaar <bram@zimbu.org>2010-02-11 17:02:11 +0100
commit27a43e954d2837fe5efae9a09bd913721ff0d8e7 (patch)
tree24dca2aeb0492a5c4131fb8c782c036df8085cef
parentefaadebe192b7142a532ec7893f8b82bea72f528 (diff)
downloadvim-27a43e954d2837fe5efae9a09bd913721ff0d8e7.tar.gz
updated for version 7.2.357v7.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 491a8d8e..99e94d5e 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 b7aacc13..b83d0b61 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,