updated for version 7.3.574

Problem:    When pasting a register in the search command line a CTRL-L
            character is not pasted. (Dominique Pelle)
Solution:   Escape the CTRL-L. (Christian Brabandt)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index c823119adc037763a492abcfb6406670dcb2ea4d..0c7dd8036384dcf014f0599d1717771530c8a746 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -3133,7 +3133,8 @@ cmdline_paste_str(s, literally)
            else
 #endif
                c = *s++;
-           if (cv == Ctrl_V || c == ESC || c == Ctrl_C || c == CAR || c == NL
+           if (cv == Ctrl_V || c == ESC || c == Ctrl_C
+                   || c == CAR || c == NL || c == Ctrl_L
 #ifdef UNIX
                    || c == intr_char
 #endif
@@ -4692,7 +4693,7 @@ ExpandFromContext(xp, pat, num_file, file, options)
                if (tab[i].ic)
                    regmatch.rm_ic = TRUE;
                ret = ExpandGeneric(xp, &regmatch, num_file, file,
-                                                tab[i].func, tab[i].escaped);
+                                               tab[i].func, tab[i].escaped);
                break;
            }
     }
@@ -5125,7 +5126,7 @@ ExpandRTDir(pat, num_file, file, dirnames)
        vim_free(matches);
     }
     if (ga.ga_len == 0)
-        return FAIL;
+       return FAIL;
 
     /* Sort and remove duplicates which can happen when specifying multiple
      * directories in dirnames. */

diff --git a/src/version.c b/src/version.c
index ebe198810077da86266a233a50a0f8de9df78eef..e798a87d8228246a75f775c5086f483316d6174a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    574,
 /**/
     573,
 /**/