Mercurial > vim
diff src/ui.c @ 13758:63679d671ced v8.0.1751
patch 8.0.1751: #ifdef causes bad highlighting
commit https://github.com/vim/vim/commit/4e601e3c82899b3a8334856397946efeaa007f29
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Apr 24 13:29:51 2018 +0200
patch 8.0.1751: #ifdef causes bad highlighting
Problem: #ifdef causes bad highlighting.
Solution: Move code around. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/2731)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 24 Apr 2018 13:30:07 +0200 |
| parents | a62b0bbc8834 |
| children | ef6de4674811 |
line wrap: on
line diff
--- 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, + size_t readlen = (size_t)((INBUFLEN - inbufcount) +# ifdef FEAT_MBYTE + / input_conv.vc_factor # endif - (char *)inbuf + inbufcount, (size_t)((INBUFLEN - inbufcount) -# ifdef FEAT_MBYTE - / 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)