To: vim_dev@googlegroups.com Subject: Patch 8.0.1749 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1749 Problem: VMS: 100% CPU use, redefining mch_open() and mch_fopen() fails. Solution: Do not wait indefinitely in RealWaitForChar(). (Neil Rieck) Do not redefine mch_open() and mch_fopen() on VMS. (Zoltan Arpadffy) Files: src/os_vms.c, src/vim.h *** ../vim-8.0.1748/src/os_vms.c 2018-04-10 18:47:16.097527017 +0200 --- src/os_vms.c 2018-04-23 20:39:51.532408581 +0200 *************** *** 784,790 **** return 0; } else if (msec < 0) { /* no time-out; wait on indefinitely */ ! continue; } else { /* time-out needs to be checked */ status = sys$gettim(&time_curr); --- 784,790 ---- return 0; } else if (msec < 0) { /* no time-out; wait on indefinitely */ ! return 1; /* fakeout to force a wait in vms_read() */ } else { /* time-out needs to be checked */ status = sys$gettim(&time_curr); *** ../vim-8.0.1748/src/vim.h 2018-04-10 12:42:41.027042171 +0200 --- src/vim.h 2018-04-23 20:42:25.271550442 +0200 *************** *** 2154,2161 **** # define number_width(x) 7 #endif ! /* This must come after including proto.h */ ! #if !(defined(FEAT_MBYTE) && defined(WIN3264)) # define mch_open(n, m, p) open((n), (m), (p)) # define mch_fopen(n, p) fopen((n), (p)) #endif --- 2154,2162 ---- # define number_width(x) 7 #endif ! /* This must come after including proto.h. ! * For VMS this is defined in macros.h. */ ! #if !(defined(FEAT_MBYTE) && defined(WIN3264)) && !defined(VMS) # define mch_open(n, m, p) open((n), (m), (p)) # define mch_fopen(n, p) fopen((n), (p)) #endif *** ../vim-8.0.1748/src/version.c 2018-04-22 13:27:38.812672851 +0200 --- src/version.c 2018-04-23 20:39:12.248627498 +0200 *************** *** 763,764 **** --- 763,766 ---- { /* Add new patch number below this line */ + /**/ + 1749, /**/ -- hundred-and-one symptoms of being an internet addict: 255. You work for a newspaper and your editor asks you to write an article about Internet addiction...in the "first person." /// 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 ///