vi: fix reading of file after last line

If the :r command is used to read a file after the last line of the
buffer the last line of the buffer and the first line of the file
are joined.  An extra blank line appears at the end of the buffer.

   file 1
   file 1
   file 1file 2
   file 2
   file 2

	~
	~

The insertion point is normally at the start of the line following the
specified line.  When the specified line is the last one the next_line
function baulks at moving to the non-existent following line.

Signed-off-by: Ron Yorston <rmy@tigress.co.uk>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/editors/vi.c b/editors/vi.c
index 7b88e8e1739248b1c56ebb6dd45ad324ce69dd3f..77535be92bc0ddedac535478618dedbcd7d9bc69 100644 (file)
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -1318,8 +1318,12 @@ static void colon(char *buf)
                        q = begin_line(dot);    // assume "dot"
                }
                // read after current line- unless user said ":0r foo"
-               if (b != 0)
+               if (b != 0) {
                        q = next_line(q);
+                       // read after last line
+                       if (q == end-1)
+                               ++q;
+               }
                { // dance around potentially-reallocated text[]
                        uintptr_t ofs = q - text;
                        size = file_insert(fn, q, 0);