To: vim_dev@googlegroups.com Subject: Patch 8.0.1751 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1751 Problem: #ifdef causes bad highlighting. Solution: Move code around. (Ozaki Kiichi, closes #2731) Files: src/ui.c *** ../vim-8.0.1750/src/ui.c 2018-03-11 19:30:40.132142717 +0100 --- src/ui.c 2018-04-24 13:28:58.658154507 +0200 *************** *** 1854,1871 **** 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) # ifdef FEAT_MBYTE ! / input_conv.vc_factor # endif ! )); ! # if 0 ! ) /* avoid syntax highlight error */ # endif if (len > 0 || got_int) --- 1854,1868 ---- len = 0; /* to avoid gcc warning */ for (try = 0; try < 100; ++try) { ! size_t readlen = (size_t)((INBUFLEN - inbufcount) # ifdef FEAT_MBYTE ! / input_conv.vc_factor # endif ! ); ! # 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) *** ../vim-8.0.1750/src/version.c 2018-04-23 21:29:42.161966057 +0200 --- src/version.c 2018-04-24 13:29:40.773928107 +0200 *************** *** 763,764 **** --- 763,766 ---- { /* Add new patch number below this line */ + /**/ + 1751, /**/ -- hundred-and-one symptoms of being an internet addict: 264. You turn to the teletext page "surfing report" and are surprised that it is about sizes of waves and a weather forecast for seaside resorts. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///