summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-04-24 13:29:51 +0200
committerBram Moolenaar <Bram@vim.org>2018-04-24 13:29:51 +0200
commit4e601e3c82899b3a8334856397946efeaa007f29 (patch)
tree0d7cfcb8ab399db03ee112a92c928d85954b1c72
parent3b9474b4ad4d85b5396f7f641b436f193dc9d486 (diff)
patch 8.0.1751: #ifdef causes bad highlightingv8.0.1751
Problem: #ifdef causes bad highlighting. Solution: Move code around. (Ozaki Kiichi, closes #2731)
-rw-r--r--src/ui.c17
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 10 deletions
diff --git a/src/ui.c b/src/ui.c
index 87f3c1eb60..9c2563829b 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1854,18 +1854,15 @@ fill_input_buf(int exit_on_error UNUSED)
len = 0; /* to avoid gcc warning */
for (try = 0; try < 100; ++try)
{
-# ifdef VMS
- len = vms_read(
-# else
- len = read(read_cmd_fd,
-# endif
- (char *)inbuf + inbufcount, (size_t)((INBUFLEN - inbufcount)
+ size_t readlen = (size_t)((INBUFLEN - inbufcount)
# ifdef FEAT_MBYTE
- / input_conv.vc_factor
+ / input_conv.vc_factor
# endif
- ));
-# if 0
- ) /* avoid syntax highlight error */
+ );
+# ifdef VMS
+ len = vms_read(read_cmd_fd, (char *)inbuf + inbufcount, readlen);
+# else
+ len = read(read_cmd_fd, (char *)inbuf + inbufcount, readlen);
# endif
if (len > 0 || got_int)
diff --git a/src/version.c b/src/version.c
index 123db5b675..ac6e0e8ffd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1751,
+/**/
1750,
/**/
1749,