updated for version 7.0123
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 858ada6..ba45f26 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.0aa. Last change: 2005 Aug 01
+*todo.txt* For Vim version 7.0aa. Last change: 2005 Aug 02
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 87fb72b..9ca05fc 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt* For Vim version 7.0aa. Last change: 2005 Aug 01
+*version7.txt* For Vim version 7.0aa. Last change: 2005 Aug 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -28,6 +28,7 @@
Scroll back in messages |new-scroll-back|
POSIX compatibility |new-posix|
Debugger support |new-debug-support|
+Remote file explorer |new-netrw-explore|
Various new items |new-items-7|
IMPROVEMENTS |improvements-7|
@@ -300,6 +301,22 @@
mouse pointer.
+Remote file explorer *new-netrw-explore*
+--------------------
+
+The netrw plugin now also supports viewing a directory, when "scp://" is used.
+Deleting and renaming files is possible.
+
+To avoid duplicating a lot of code, the previous file explorer plugin has been
+integrated in the netrw plugin. This means browsing local and remote files
+works the same way.
+
+":browse edit" and ":browse split" use the netrw plugin when it's available
+and a GUI dialog is not possible.
+
+The netrw plugin is maintained by Charles Campbell.
+
+
Various new items *new-items-7*
-----------------
@@ -524,9 +541,6 @@
event and the drag receive handler to work around a stall after Vim loads a
file. Fixed an off-by-one line number error. (Da Woon Jung)
-The netrw plugin now also supports viewing a directory, when "scp://" is used.
-Deleting and renaming files is possible. (Charles Campbell)
-
Added the t_SI and t_EI escape sequences for starting and ending Insert mode.
To be used to set the cursor shape to a bar or a block. No default values,
they are not supported by termcap/terminfo.
@@ -734,6 +748,12 @@
When 'verbose' is set the output of ":highlight" will show where a highlight
item was last set.
+For 'errorformat' it was not possible to have a file name that contains the
+character that follows after "%f". For example, in "%f:%l:%m" the file name
+could not contain ":". Now include the first ":" where the rest of the
+pattern matches. In the example a ":" not followed by a line number is
+included in the file name. (suggested by Emanuele Giaquinta)
+
==============================================================================
COMPILE TIME CHANGES *compile-changes-7*
@@ -1250,4 +1270,6 @@
When deleting non-existing text while 'virtualedit' is set the '[ and '] marks
were not set.
+Win32: Could not use "**/" in 'path', it had to be "**\".
+
vim:tw=78:ts=8:ft=help:norl:
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 5248246..a58f91a 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2952,11 +2952,25 @@
#ifdef FEAT_BROWSE
if (cmdmod.browse)
{
- browse_file = do_browse(0, (char_u *)_("Edit File"), ffname,
+ if (
+# ifdef FEAT_GUI
+ !gui.in_use &&
+# endif
+ au_has_group((char_u *)"FileExplorer"))
+ {
+ /* No browsing supported but we do have the file explorer:
+ * Edit the directory. */
+ if (ffname == NULL || !mch_isdir(ffname))
+ ffname = (char_u *)".";
+ }
+ else
+ {
+ browse_file = do_browse(0, (char_u *)_("Edit File"), ffname,
NULL, NULL, NULL, curbuf);
- if (browse_file == NULL)
- goto theend;
- ffname = browse_file;
+ if (browse_file == NULL)
+ goto theend;
+ ffname = browse_file;
+ }
}
#endif
/* if no short name given, use ffname for short name */