Mercurial > vim

changeset 3628:3ac005f02cf0 v7.3.574

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Fri, 29 Jun 2012 13:44:41 +0200
parents c1bf4ba956d1
children c1ade43321bf
files src/ex_getln.c src/version.c
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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, fil
 		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, dirname
 	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. */
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    574,
+/**/
     573,
 /**/
     572,