diff options
| author | bapt <bapt@FreeBSD.org> | 2016-05-07 18:48:48 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2016-05-07 18:48:48 +0000 |
| commit | df74ac413bf394ee0a163888b748bac3906b4fce (patch) | |
| tree | 1e6c83983dcd58b4b4acb51efffda12634519a08 /usr.bin | |
| parent | f325e54255cd169dddfc3d3c274f44e5a196df4b (diff) | |
| download | FreeBSD-src-df74ac413bf394ee0a163888b748bac3906b4fce.zip FreeBSD-src-df74ac413bf394ee0a163888b748bac3906b4fce.tar.gz | |
Only use EDITOR as a variable to specify which text editor to use
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/sdiff/edit.c | 5 | ||||
| -rw-r--r-- | 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 21f7cdc..16345da 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 16e340a..11e605d 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 |
