To: vim_dev@googlegroups.com Subject: Patch 8.0.1588 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1588 Problem: Popup menu hangs after typing CTRL-C. Solution: Make CTRL-C exit the loop. (Ozaki Kiichi, closes #2697) Files: src/popupmnu.c *** ../vim-8.0.1587/src/popupmnu.c 2018-03-06 11:43:00.327652783 +0100 --- src/popupmnu.c 2018-03-07 22:06:57.377123226 +0100 *************** *** 1175,1181 **** out_flush(); c = vgetc(); ! if (c == ESC) break; else if (c == CAR || c == NL) { --- 1175,1181 ---- out_flush(); c = vgetc(); ! if (c == ESC || c == Ctrl_C) break; else if (c == CAR || c == NL) { *************** *** 1211,1217 **** } else if (c == K_LEFTDRAG || c == K_RIGHTDRAG || c == K_MOUSEMOVE) { ! /* mouse moved: selec item in the mouse row */ pum_select_mouse_pos(); } else if (c == K_LEFTMOUSE || c == K_LEFTMOUSE_NM || c == K_RIGHTRELEASE) --- 1211,1217 ---- } else if (c == K_LEFTDRAG || c == K_RIGHTDRAG || c == K_MOUSEMOVE) { ! /* mouse moved: select item in the mouse row */ pum_select_mouse_pos(); } else if (c == K_LEFTMOUSE || c == K_LEFTMOUSE_NM || c == K_RIGHTRELEASE) *** ../vim-8.0.1587/src/version.c 2018-03-06 19:51:09.142529920 +0100 --- src/version.c 2018-03-07 22:08:15.712598710 +0100 *************** *** 768,769 **** --- 768,771 ---- { /* Add new patch number below this line */ + /**/ + 1588, /**/ -- The word "leader" is derived from the word "lead", as in the material that bullets are made out of. The term "leader" was popularized at about the same time as the invention of firearms. It grew out of the observation that the person in charge of every organization was the person whom everyone wanted to fill with hot lead. I don't recomment this; it's just a point of historical interest. (Scott Adams - The Dilbert principle) /// 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 ///