patch 7.4.1858
Problem: When a channel writes to a buffer it doesn't find a buffer by the
short name but re-uses it anyway.
Solution: Find buffer also by the short name.
diff --git a/src/buffer.c b/src/buffer.c
index b0e3a22..0bbb1f4 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1649,6 +1649,7 @@
* If (flags & BLN_CURBUF) is TRUE, may use current buffer.
* If (flags & BLN_LISTED) is TRUE, add new buffer to buffer list.
* If (flags & BLN_DUMMY) is TRUE, don't count it as a real buffer.
+ * If (flags & BLN_NEW) is TRUE, don't use an existing buffer.
* This is the ONLY way to create a new buffer.
*/
static int top_file_num = 1; /* highest file number */
@@ -1676,7 +1677,7 @@
if (sfname == NULL || mch_stat((char *)sfname, &st) < 0)
st.st_dev = (dev_T)-1;
#endif
- if (ffname != NULL && !(flags & BLN_DUMMY) && (buf =
+ if (ffname != NULL && !(flags & (BLN_DUMMY | BLN_NEW)) && (buf =
#ifdef UNIX
buflist_findname_stat(ffname, &st)
#else
diff --git a/src/channel.c b/src/channel.c
index 973d234..b1f7f1a 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1079,11 +1079,15 @@
buf_T *save_curbuf = curbuf;
if (name != NULL && *name != NUL)
+ {
buf = buflist_findname(name);
+ if (buf == NULL)
+ buf = buflist_findname_exp(name);
+ }
if (buf == NULL)
{
buf = buflist_new(name == NULL || *name == NUL ? NULL : name,
- NULL, (linenr_T)0, BLN_LISTED);
+ NULL, (linenr_T)0, BLN_LISTED | BLN_NEW);
if (buf == NULL)
return NULL;
buf_copy_options(buf, BCO_ENTER);
diff --git a/src/version.c b/src/version.c
index c3afbad..85f57e5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1858,
+/**/
1857,
/**/
1856,
diff --git a/src/vim.h b/src/vim.h
index a5d05a1..8ce11d6 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -907,9 +907,10 @@
#define GETF_SWITCH 0x04 /* respect 'switchbuf' settings when jumping */
/* Values for buflist_new() flags */
-#define BLN_CURBUF 1 /* May re-use curbuf for new buffer */
-#define BLN_LISTED 2 /* Put new buffer in buffer list */
-#define BLN_DUMMY 4 /* Allocating dummy buffer */
+#define BLN_CURBUF 1 /* may re-use curbuf for new buffer */
+#define BLN_LISTED 2 /* put new buffer in buffer list */
+#define BLN_DUMMY 4 /* allocating dummy buffer */
+#define BLN_NEW 8 /* create a new buffer */
/* Values for in_cinkeys() */
#define KEY_OPEN_FORW 0x101
