From 041db576841eddcc157217eecb8e56969b263b88 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 7 May 2016 18:48:48 +0000
Subject: [PATCH] Only use EDITOR as a variable to specify which text editor to
 use

---
 usr.bin/sdiff/edit.c  |  5 +----
 usr.bin/sdiff/sdiff.1 | 18 ++----------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/usr.bin/sdiff/edit.c b/usr.bin/sdiff/edit.c
index 21f7cdc6a247..16345da472ef 100644
--- a/usr.bin/sdiff/edit.c
+++ b/usr.bin/sdiff/edit.c
@@ -40,10 +40,7 @@ editit(const char *pathname)
 	int saved_errno, st, ret = -1;
 	const char *ed;
 
-	ed = getenv("VISUAL");
-	if (ed == NULL)
-		ed = getenv("EDITOR");
-	if (ed == NULL)
+	if ((ed = getenv("EDITOR")) == NULL)
 		ed = _PATH_VI;
 
 	sighup = signal(SIGHUP, SIG_IGN);
diff --git a/usr.bin/sdiff/sdiff.1 b/usr.bin/sdiff/sdiff.1
index 16e340a70ded..11e605d5368d 100644
--- a/usr.bin/sdiff/sdiff.1
+++ b/usr.bin/sdiff/sdiff.1
@@ -4,7 +4,7 @@
 .\" Written by Raymond Lai <ray@cyth.net>.
 .\" Public domain.
 .\"
-.Dd $Mdocdate: July 5 2012 $
+.Dd May 7, 2016
 .Dt SDIFF 1
 .Os
 .Sh NAME
@@ -50,8 +50,6 @@ into
 In this mode, the user is prompted for each set of differences.
 See
 .Ev EDITOR
-and
-.Ev VISUAL ,
 below,
 for details of which editor, if any, is invoked.
 .Pp
@@ -133,22 +131,10 @@ Change the size of tabs (default is 8.)
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width Ds
-.It Ev EDITOR , VISUAL
+.It Ev EDITOR
 Specifies an editor to use with the
 .Fl o
 option.
-If both
-.Ev EDITOR
-and
-.Ev VISUAL
-are set,
-.Ev VISUAL
-takes precedence.
-If neither
-.Ev EDITOR
-nor
-.Ev VISUAL
-are set,
 the default is
 .Xr vi 1 .
 .It Ev TMPDIR