summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-10-14 15:24:49 +0200
committerBram Moolenaar <Bram@vim.org>2017-10-14 15:24:49 +0200
commit6047e2c722347ae9443c2632c6e061918ccef9c6 (patch)
tree10ef3ad656c74b93ac7d5eb3e1728dffc391e198
parent1d68d9b2bd60d848552c08763e590edde16056c9 (diff)
patch 8.0.1189: E172 is not actually usefulv8.0.1189
Problem: E172 is not actually useful, it's only on Unix anyway. Solution: Remove the check and the error.
-rw-r--r--runtime/doc/message.txt6
-rw-r--r--src/ex_docmd.c23
-rw-r--r--src/version.c2
3 files changed, 2 insertions, 29 deletions
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 5eeba0cf4a..dbc4280b70 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -463,12 +463,6 @@ changed. To avoid the message reset the 'warn' option.
Something inside Vim went wrong and resulted in a NULL pointer. If you know
how to reproduce this problem, please report it. |bugs|
- *E172* >
- Only one file name allowed
-
-The ":edit" command only accepts one file name. When you want to specify
-several files for editing use ":next" |:next|.
-
*E41* *E82* *E83* *E342* >
Out of memory!
Out of memory! (allocating {number} bytes)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index e2dfd9225c..bb1ae46907 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -5085,29 +5085,6 @@ expand_filename(
{
if (n == 2)
{
-#ifdef UNIX
- /*
- * Only for Unix we check for more than one file name.
- * For other systems spaces are considered to be part
- * of the file name.
- * Only check here if there is no wildcard, otherwise
- * ExpandOne() will check for errors. This allows
- * ":e `ls ve*.c`" on Unix.
- */
- if (!has_wildcards)
- for (p = eap->arg; *p; ++p)
- {
- /* skip escaped characters */
- if (p[1] && (*p == '\\' || *p == Ctrl_V))
- ++p;
- else if (VIM_ISWHITE(*p))
- {
- *errormsgp = (char_u *)_("E172: Only one file name allowed");
- return FAIL;
- }
- }
-#endif
-
/*
* Halve the number of backslashes (this is Vi compatible).
* For Unix and OS/2, when wildcards are expanded, this is
diff --git a/src/version.c b/src/version.c
index 8742035042..451eb36c86 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1189,
+/**/
1188,
/**/
1187,