To: vim_dev@googlegroups.com Subject: Patch 7.4.1757 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1757 Problem: When using complete() it may set 'modified' even though nothing was inserted. Solution: Use Down/Up instead of Next/Previous match. (Shougo, closes #745) Files: src/edit.c *** ../vim-7.4.1756/src/edit.c 2016-04-20 12:01:49.540584913 +0200 --- src/edit.c 2016-04-20 16:35:32.068896099 +0200 *************** *** 2813,2824 **** compl_cont_status = 0; compl_curr_match = compl_first_match; ! if (compl_no_insert) ins_complete(K_DOWN, FALSE); else ins_complete(Ctrl_N, FALSE); - if (compl_no_select) - ins_complete(Ctrl_P, FALSE); /* Lazily show the popup menu, unless we got interrupted. */ if (!compl_interrupted) --- 2813,2827 ---- compl_cont_status = 0; compl_curr_match = compl_first_match; ! if (compl_no_insert || compl_no_select) ! { ins_complete(K_DOWN, FALSE); + if (compl_no_select) + /* Down/Up has no real effect. */ + ins_complete(K_UP, FALSE); + } else ins_complete(Ctrl_N, FALSE); /* Lazily show the popup menu, unless we got interrupted. */ if (!compl_interrupted) *************** *** 4969,4976 **** ins_compl_key2dir(int c) { if (c == Ctrl_P || c == Ctrl_L ! || (pum_visible() && (c == K_PAGEUP || c == K_KPAGEUP ! || c == K_S_UP || c == K_UP))) return BACKWARD; return FORWARD; } --- 4972,4978 ---- ins_compl_key2dir(int c) { if (c == Ctrl_P || c == Ctrl_L ! || c == K_PAGEUP || c == K_KPAGEUP || c == K_S_UP || c == K_UP) return BACKWARD; return FORWARD; } *** ../vim-7.4.1756/src/version.c 2016-04-20 16:19:10.034987592 +0200 --- src/version.c 2016-04-20 16:33:29.158159096 +0200 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1757, /**/ -- MORTICIAN: Bring out your dead! [clang] Bring out your dead! [clang] Bring out your dead! CUSTOMER: Here's one -- nine pence. DEAD PERSON: I'm not dead! The Quest for the Holy Grail (Monty Python) /// 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 ///