Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into merge

Conflicts:
	include/platform.h

2 files changed, 5 insertions, 3 deletions

diff --git a/editors/diff.c b/editors/diff.c
index 8c0a31f47..3a3334640 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -693,10 +693,12 @@ static bool diff(FILE* fp[2], char *file[2])
 
 static int diffreg(char *file[2])
 {
-        FILE *fp[2] = { stdin, stdin };
+        FILE *fp[2];
         bool binary = false, differ = false;
         int status = STATUS_SAME, i;
 
+        fp[0] = stdin;
+        fp[1] = stdin;
         for (i = 0; i < 2; i++) {
                 int fd = open_or_warn_stdin(file[i]);
                 if (fd == -1)
diff --git a/editors/vi.c b/editors/vi.c
index deb471d04..9708679b4 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -132,8 +132,8 @@
 //config:       help
 //config:         If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
 //config:         this option makes vi perform a last-ditch effort to find it:
-//config:         vi positions cursor to 999,999 and asks terminal to report real
-//config:         cursor position using "ESC [ 6 n" escape sequence, then reads stdin.
+//config:         position cursor to 999,999 and ask terminal to report real
+//config:         cursor position using "ESC [ 6 n" escape sequence, then read stdin.
 //config:
 //config:         This is not clean but helps a lot on serial lines and such.
 //config: