]> granicus.if.org Git - vim/commitdiff
updated for version 7.1-032 v7.1.032
authorBram Moolenaar <Bram@vim.org>
Tue, 17 Jul 2007 16:15:36 +0000 (16:15 +0000)
committerBram Moolenaar <Bram@vim.org>
Tue, 17 Jul 2007 16:15:36 +0000 (16:15 +0000)
src/ex_getln.c
src/version.c

index b1afab55bc75cad644fe5e2b6776461729561102..e59eb1b29787bb82386d97cba24a7fe14235b528 100644 (file)
@@ -484,7 +484,8 @@ getcmdline(firstc, count, indent)
        if (xpc.xp_context == EXPAND_MENUNAMES && p_wmnu)
        {
            /* Hitting <Down> after "emenu Name.": complete submenu */
-           if (ccline.cmdbuff[ccline.cmdpos - 1] == '.' && c == K_DOWN)
+           if (c == K_DOWN && ccline.cmdpos > 0
+                                 && ccline.cmdbuff[ccline.cmdpos - 1] == '.')
                c = p_wc;
            else if (c == K_UP)
            {
@@ -533,9 +534,11 @@ getcmdline(firstc, count, indent)
            upseg[3] = PATHSEP;
            upseg[4] = NUL;
 
-           if (ccline.cmdbuff[ccline.cmdpos - 1] == PATHSEP
-                   && c == K_DOWN
-                   && (ccline.cmdbuff[ccline.cmdpos - 2] != '.'
+           if (c == K_DOWN
+                   && ccline.cmdpos > 0
+                   && ccline.cmdbuff[ccline.cmdpos - 1] == PATHSEP
+                   && (ccline.cmdpos < 3
+                       || ccline.cmdbuff[ccline.cmdpos - 2] != '.'
                        || ccline.cmdbuff[ccline.cmdpos - 3] != '.'))
            {
                /* go down a directory */
@@ -730,8 +733,8 @@ getcmdline(firstc, count, indent)
            /* In Ex mode a backslash escapes a newline. */
            if (exmode_active
                    && c != ESC
-                   && ccline.cmdpos > 0
                    && ccline.cmdpos == ccline.cmdlen
+                   && ccline.cmdpos > 0
                    && ccline.cmdbuff[ccline.cmdpos - 1] == '\\')
            {
                if (c == K_KENTER)
index 0985a502a25549174628581e213de1d768e60fff..082ce127f4bab295fd9db869930d123d022ef439 100644 (file)
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    32,
 /**/
     31,
 /**/