[vim] 73/139: 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)

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 8e42ae5069d4985869e46eaa56900ed19e30f504
Author: Bram Moolenaar <Bram at vim.org>
Date:   Wed Apr 20 16:39:19 2016 +0200

    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)
---
 src/edit.c    | 12 +++++++-----
 src/version.c |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/edit.c b/src/edit.c
index 080e1ab..c813d1f 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -2813,12 +2813,15 @@ set_completion(colnr_T startcol, list_T *list)
     compl_cont_status = 0;
 
     compl_curr_match = compl_first_match;
-    if (compl_no_insert)
+    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);
-    if (compl_no_select)
-	ins_complete(Ctrl_P, FALSE);
 
     /* Lazily show the popup menu, unless we got interrupted. */
     if (!compl_interrupted)
@@ -4969,8 +4972,7 @@ ins_compl_check_keys(int frequency)
 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)))
+	    || c == K_PAGEUP || c == K_KPAGEUP || c == K_S_UP || c == K_UP)
 	return BACKWARD;
     return FORWARD;
 }
diff --git a/src/version.c b/src/version.c
index 6fdc9da..6308789 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1757,
+/**/
     1756,
 /**/
     1755,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git