0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 7.4.896

Problem:    Editing a URL, which netrw should handle, doesn't work.
Solution:   Avoid changing slashes to backslashes. (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar 2015-10-13 19:43:17 +02:00
parent 23d1b62746
commit b4f6a46b01
3 changed files with 9 additions and 1 deletions

View File

@ -7547,7 +7547,8 @@ vim_tempname(extra_char, keep)
#if defined(BACKSLASH_IN_FILENAME) || defined(PROTO) #if defined(BACKSLASH_IN_FILENAME) || defined(PROTO)
/* /*
* Convert all backslashes in fname to forward slashes in-place. * Convert all backslashes in fname to forward slashes in-place, unless when
* it looks like a URL.
*/ */
void void
forward_slash(fname) forward_slash(fname)
@ -7555,6 +7556,8 @@ forward_slash(fname)
{ {
char_u *p; char_u *p;
if (path_with_url(fname))
return;
for (p = fname; *p != NUL; ++p) for (p = fname; *p != NUL; ++p)
# ifdef FEAT_MBYTE # ifdef FEAT_MBYTE
/* The Big5 encoding can have '\' in the trail byte. */ /* The Big5 encoding can have '\' in the trail byte. */

View File

@ -481,11 +481,14 @@ mch_isFullName(char_u *fname)
* commands that use a file name should try to avoid the need to type a * commands that use a file name should try to avoid the need to type a
* backslash twice. * backslash twice.
* When 'shellslash' set do it the other way around. * When 'shellslash' set do it the other way around.
* When the path looks like a URL leave it unmodified.
*/ */
void void
slash_adjust(p) slash_adjust(p)
char_u *p; char_u *p;
{ {
if (path_with_url(p))
return;
while (*p) while (*p)
{ {
if (*p == psepcN) if (*p == psepcN)

View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
896,
/**/ /**/
895, 895,
/**/ /**/