patch 9.0.0274: netrw plugin does not show remote files
Problem: Netrw plugin does not show remote files.
Solution: Do read a file when 'buftype' is "acwrite". (closes #10983)
diff --git a/src/buffer.c b/src/buffer.c
index 2c81694..edf71b0 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -48,7 +48,7 @@
static int append_arg_number(win_T *wp, char_u *buf, int buflen, int add_file);
static void free_buffer(buf_T *);
static void free_buffer_stuff(buf_T *buf, int free_options);
-static void clear_wininfo(buf_T *buf);
+static int bt_nofileread(buf_T *buf);
#ifdef UNIX
# define dev_T dev_t
@@ -223,7 +223,7 @@
// A buffer without an actual file should not use the buffer name to read a
// file.
- if (bt_quickfix(curbuf) || bt_nofilename(curbuf))
+ if (bt_nofileread(curbuf))
flags |= READ_NOFILE;
// Read the file if there is one.
@@ -978,6 +978,22 @@
}
/*
+ * Free the b_wininfo list for buffer "buf".
+ */
+ static void
+clear_wininfo(buf_T *buf)
+{
+ wininfo_T *wip;
+
+ while (buf->b_wininfo != NULL)
+ {
+ wip = buf->b_wininfo;
+ buf->b_wininfo = wip->wi_next;
+ free_wininfo(wip);
+ }
+}
+
+/*
* Free stuff in the buffer for ":bdel" and when wiping out the buffer.
*/
static void
@@ -1036,22 +1052,6 @@
}
/*
- * Free the b_wininfo list for buffer "buf".
- */
- static void
-clear_wininfo(buf_T *buf)
-{
- wininfo_T *wip;
-
- while (buf->b_wininfo != NULL)
- {
- wip = buf->b_wininfo;
- buf->b_wininfo = wip->wi_next;
- free_wininfo(wip);
- }
-}
-
-/*
* Go to another buffer. Handles the result of the ATTENTION dialog.
*/
void
@@ -5709,7 +5709,8 @@
/*
* Return TRUE if "buf" is a "nofile", "acwrite", "terminal" or "prompt"
- * buffer. This means the buffer name is not a file name.
+ * buffer. This means the buffer name may not be a file name, at least not for
+ * writing the buffer.
*/
int
bt_nofilename(buf_T *buf)
@@ -5720,6 +5721,19 @@
|| buf->b_p_bt[0] == 'p');
}
+/*
+ * Return TRUE if "buf" is a "nofile", "quickfix", "terminal" or "prompt"
+ * buffer. This means the buffer is not to be read from a file.
+ */
+ static int
+bt_nofileread(buf_T *buf)
+{
+ return buf != NULL && ((buf->b_p_bt[0] == 'n' && buf->b_p_bt[2] == 'f')
+ || buf->b_p_bt[0] == 't'
+ || buf->b_p_bt[0] == 'q'
+ || buf->b_p_bt[0] == 'p');
+}
+
#if defined(FEAT_QUICKFIX) || defined(PROTO)
/*
* Return TRUE if "buf" has 'buftype' set to "nofile".