To: vim_dev@googlegroups.com Subject: Patch 8.2.1608 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1608 Problem: Vim9: getchar() test fails with GUI. Solution: Avoid that getchar(0) gets stuck on K_IGNORE. Files: src/getchar.c *** ../vim-8.2.1607/src/getchar.c 2020-09-05 17:51:19.626561774 +0200 --- src/getchar.c 2020-09-05 19:57:50.321111749 +0200 *************** *** 2044,2053 **** // illegal argument or getchar(0) and no char avail: return zero n = 0; else ! // getchar(0) and char avail: return char ! n = plain_vgetc(); ! if (n == K_IGNORE || n == K_MOUSEMOVE) continue; break; } --- 2044,2055 ---- // illegal argument or getchar(0) and no char avail: return zero n = 0; else ! // getchar(0) and char avail() != NUL: get a character. ! // Note that vpeekc_any() returns K_SPECIAL for K_IGNORE. ! n = safe_vgetc(); ! if (n == K_IGNORE || n == K_MOUSEMOVE ! || n == K_VER_SCROLLBAR || n == K_HOR_SCROLLBAR) continue; break; } *** ../vim-8.2.1607/src/version.c 2020-09-05 18:48:53.843184261 +0200 --- src/version.c 2020-09-05 19:59:20.608894008 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1608, /**/ -- MARTHA'S WAY: Don't throw out all that leftover wine. Freeze into ice cubes for future use in casseroles and sauces. MY WAY: What leftover wine? /// 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 ///