|
Karsten Hopp |
4c5649 |
To: vim_dev@googlegroups.com
|
|
Karsten Hopp |
4c5649 |
Subject: Patch 7.4.896
|
|
Karsten Hopp |
4c5649 |
Fcc: outbox
|
|
Karsten Hopp |
4c5649 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
Karsten Hopp |
4c5649 |
Mime-Version: 1.0
|
|
Karsten Hopp |
4c5649 |
Content-Type: text/plain; charset=UTF-8
|
|
Karsten Hopp |
4c5649 |
Content-Transfer-Encoding: 8bit
|
|
Karsten Hopp |
4c5649 |
------------
|
|
Karsten Hopp |
4c5649 |
|
|
Karsten Hopp |
4c5649 |
Patch 7.4.896
|
|
Karsten Hopp |
4c5649 |
Problem: Editing a URL, which netrw should handle, doesn't work.
|
|
Karsten Hopp |
4c5649 |
Solution: Avoid changing slashes to backslashes. (Yasuhiro Matsumoto)
|
|
Karsten Hopp |
4c5649 |
Files: src/fileio.c, src/os_mswin.c
|
|
Karsten Hopp |
4c5649 |
|
|
Karsten Hopp |
4c5649 |
|
|
Karsten Hopp |
4c5649 |
*** ../vim-7.4.895/src/fileio.c 2015-08-11 18:45:43.122311811 +0200
|
|
Karsten Hopp |
4c5649 |
--- src/fileio.c 2015-10-13 19:41:02.297893970 +0200
|
|
Karsten Hopp |
4c5649 |
***************
|
|
Karsten Hopp |
4c5649 |
*** 7547,7553 ****
|
|
Karsten Hopp |
4c5649 |
|
|
Karsten Hopp |
4c5649 |
#if defined(BACKSLASH_IN_FILENAME) || defined(PROTO)
|
|
Karsten Hopp |
4c5649 |
/*
|
|
Karsten Hopp |
4c5649 |
! * Convert all backslashes in fname to forward slashes in-place.
|
|
Karsten Hopp |
4c5649 |
*/
|
|
Karsten Hopp |
4c5649 |
void
|
|
Karsten Hopp |
4c5649 |
forward_slash(fname)
|
|
Karsten Hopp |
4c5649 |
--- 7547,7554 ----
|
|
Karsten Hopp |
4c5649 |
|
|
Karsten Hopp |
4c5649 |
#if defined(BACKSLASH_IN_FILENAME) || defined(PROTO)
|
|
Karsten Hopp |
4c5649 |
/*
|
|
Karsten Hopp |
4c5649 |
! * Convert all backslashes in fname to forward slashes in-place, unless when
|
|
Karsten Hopp |
4c5649 |
! * it looks like a URL.
|
|
Karsten Hopp |
4c5649 |
*/
|
|
Karsten Hopp |
4c5649 |
void
|
|
Karsten Hopp |
4c5649 |
forward_slash(fname)
|
|
Karsten Hopp |
4c5649 |
***************
|
|
Karsten Hopp |
4c5649 |
*** 7555,7560 ****
|
|
Karsten Hopp |
4c5649 |
--- 7556,7563 ----
|
|
Karsten Hopp |
4c5649 |
{
|
|
Karsten Hopp |
4c5649 |
char_u *p;
|
|
Karsten Hopp |
4c5649 |
|
|
Karsten Hopp |
4c5649 |
+ if (path_with_url(fname))
|
|
Karsten Hopp |
4c5649 |
+ return;
|
|
Karsten Hopp |
4c5649 |
for (p = fname; *p != NUL; ++p)
|
|
Karsten Hopp |
4c5649 |
# ifdef FEAT_MBYTE
|
|
Karsten Hopp |
4c5649 |
/* The Big5 encoding can have '\' in the trail byte. */
|
|
Karsten Hopp |
4c5649 |
*** ../vim-7.4.895/src/os_mswin.c 2014-11-05 19:33:19.548314778 +0100
|
|
Karsten Hopp |
4c5649 |
--- src/os_mswin.c 2015-10-13 19:41:56.637324394 +0200
|
|
Karsten Hopp |
4c5649 |
***************
|
|
Karsten Hopp |
4c5649 |
*** 481,491 ****
|
|
Karsten Hopp |
4c5649 |
--- 481,494 ----
|
|
Karsten Hopp |
4c5649 |
* commands that use a file name should try to avoid the need to type a
|
|
Karsten Hopp |
4c5649 |
* backslash twice.
|
|
Karsten Hopp |
4c5649 |
* When 'shellslash' set do it the other way around.
|
|
Karsten Hopp |
4c5649 |
+ * When the path looks like a URL leave it unmodified.
|
|
Karsten Hopp |
4c5649 |
*/
|
|
Karsten Hopp |
4c5649 |
void
|
|
Karsten Hopp |
4c5649 |
slash_adjust(p)
|
|
Karsten Hopp |
4c5649 |
char_u *p;
|
|
Karsten Hopp |
4c5649 |
{
|
|
Karsten Hopp |
4c5649 |
+ if (path_with_url(p))
|
|
Karsten Hopp |
4c5649 |
+ return;
|
|
Karsten Hopp |
4c5649 |
while (*p)
|
|
Karsten Hopp |
4c5649 |
{
|
|
Karsten Hopp |
4c5649 |
if (*p == psepcN)
|
|
Karsten Hopp |
4c5649 |
*** ../vim-7.4.895/src/version.c 2015-10-13 19:18:00.252374217 +0200
|
|
Karsten Hopp |
4c5649 |
--- src/version.c 2015-10-13 19:21:05.238436798 +0200
|
|
Karsten Hopp |
4c5649 |
***************
|
|
Karsten Hopp |
4c5649 |
*** 743,744 ****
|
|
Karsten Hopp |
4c5649 |
--- 743,746 ----
|
|
Karsten Hopp |
4c5649 |
{ /* Add new patch number below this line */
|
|
Karsten Hopp |
4c5649 |
+ /**/
|
|
Karsten Hopp |
4c5649 |
+ 896,
|
|
Karsten Hopp |
4c5649 |
/**/
|
|
Karsten Hopp |
4c5649 |
|
|
Karsten Hopp |
4c5649 |
--
|
|
Karsten Hopp |
4c5649 |
Have you heard about the new Beowulf cluster? It's so fast, it executes
|
|
Karsten Hopp |
4c5649 |
an infinite loop in 6 seconds.
|
|
Karsten Hopp |
4c5649 |
|
|
Karsten Hopp |
4c5649 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
Karsten Hopp |
4c5649 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
Karsten Hopp |
4c5649 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
Karsten Hopp |
4c5649 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|