diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2020-10-01 04:46:23 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2020-10-01 04:46:23 +0000 |
| commit | 755cc40c21ca63388c6a67ba848a908b429e9391 (patch) | |
| tree | ebc3d086d4600122593fa23e077a95ce30c5f4bc /usr.bin/vi | |
| parent | 7cc42f6d25ef2e19059d088fa7d4853fe9afefb5 (diff) | |
| parent | b4ed613595432ece6802d09bfabad18e09aa26f3 (diff) | |
Update nvi to 2.2.0-05ed8b9
This version incorporates many fixes in particular a fix for vi -w
Another approach was proposed to merge those fixes (see review), I find
it easier to track changes if we keep importing snapshot on regular
basis
PR: 241985
Reported by: fernape
Differential Revision: https://reviews.freebsd.org/D26158
Notes
Notes:
svn path=/head/; revision=366309
Diffstat (limited to 'usr.bin/vi')
| -rw-r--r-- | usr.bin/vi/catalog/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/vi/pathnames.h | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/vi/catalog/Makefile b/usr.bin/vi/catalog/Makefile index 45e6fcf16357..72b2dc8c67b7 100644 --- a/usr.bin/vi/catalog/Makefile +++ b/usr.bin/vi/catalog/Makefile @@ -20,6 +20,7 @@ SCAN= ${V}/cl/*.c ${V}/common/*.c ${V}/ex/*.c ${V}/vi/*.c all: dump build-tools: dump +WARNS= 3 # Helper since iconv is non trivial to make a build tool utf8convert: @@ -102,7 +103,7 @@ english.base: dump ${SCAN} #Makefile sed -e '/|/!d' \ -e 's/|/ "/' \ -e 's/^"//' |\ - sort -nu > $@ + LC_ALL=C sort -nu > $@ DEPENDOBJS+= dump diff --git a/usr.bin/vi/pathnames.h b/usr.bin/vi/pathnames.h index 20114d981cdc..f788c05bb5eb 100644 --- a/usr.bin/vi/pathnames.h +++ b/usr.bin/vi/pathnames.h @@ -15,9 +15,8 @@ #define _PATH_NEXRC ".nexrc" #endif -#ifndef _PATH_PRESERVE -#define _PATH_PRESERVE "/var/tmp/vi.recover/" -#endif +/* On linux _PATH_PRESERVE is only writable by root */ +#define NVI_PATH_PRESERVE "/var/tmp/vi.recover/" #ifndef _PATH_SYSEXRC #define _PATH_SYSEXRC "/etc/vi.exrc" |