Date: Wed, 27 Sep 2023 16:15:05 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 0fcececbac98 - main - nvi: import version 2.2.1 Message-ID: <202309271615.38RGF5nT060620@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0fcececbac9880b092aeb56a41a16f1ec8ac1ae6 commit 0fcececbac9880b092aeb56a41a16f1ec8ac1ae6 Merge: 87534f95dd2e 16c0a3151e5f Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2023-09-27 16:01:58 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2023-09-27 16:14:45 +0000 nvi: import version 2.2.1 contrib/nvi/CMakeLists.txt | 4 + contrib/nvi/INSTALL.md | 47 ++++++++++++ contrib/nvi/README | 26 ++++++- contrib/nvi/common/key.c | 95 ++++++++++++++++++++++- contrib/nvi/common/main.c | 3 +- contrib/nvi/common/options.c | 2 + contrib/nvi/common/options_f.c | 2 +- contrib/nvi/common/search.c | 11 ++- contrib/nvi/ex/ex.c | 13 +++- contrib/nvi/ex/ex_argv.c | 6 +- contrib/nvi/ex/ex_subst.c | 7 +- contrib/nvi/man/vi.1 | 4 + contrib/nvi/vi/v_paragraph.c | 11 ++- contrib/nvi/vi/v_redraw.c | 1 + usr.bin/vi/ex/version.h | 3 +- usr.bin/vi/options_def.h | 169 +++++++++++++++++++++-------------------- 16 files changed, 298 insertions(+), 106 deletions(-) diff --cc contrib/nvi/INSTALL.md index 000000000000,7b2fd35b7c60..7b2fd35b7c60 mode 000000,100644..100644 --- a/contrib/nvi/INSTALL.md +++ b/contrib/nvi/INSTALL.md diff --cc usr.bin/vi/ex/version.h index 657da969e721,000000000000..1c18911cc593 mode 100644,000000..100644 --- a/usr.bin/vi/ex/version.h +++ b/usr.bin/vi/ex/version.h @@@ -1,2 -1,0 +1,1 @@@ - - #define VI_VERSION "2.2.0 (2020-08-01)" ++#define VI_VERSION "2.2.1 (2023-09-25)" diff --cc usr.bin/vi/options_def.h index 54dd6c20c891,000000000000..cd6f5ba3eb26 mode 100644,000000..100644 --- a/usr.bin/vi/options_def.h +++ b/usr.bin/vi/options_def.h @@@ -1,84 -1,0 +1,85 @@@ - #define O_ALTWERASE 0 - #define O_AUTOINDENT 1 - #define O_AUTOPRINT 2 - #define O_AUTOWRITE 3 - #define O_BACKUP 4 - #define O_BEAUTIFY 5 - #define O_CDPATH 6 - #define O_CEDIT 7 - #define O_COLUMNS 8 - #define O_COMBINED 9 - #define O_COMMENT 10 - #define O_TMPDIR 11 - #define O_EDCOMPATIBLE 12 - #define O_ERRORBELLS 13 - #define O_ESCAPETIME 14 - #define O_EXPANDTAB 15 - #define O_EXRC 16 - #define O_EXTENDED 17 - #define O_FILEC 18 - #define O_FILEENCODING 19 - #define O_FLASH 20 - #define O_HARDTABS 21 - #define O_ICLOWER 22 - #define O_IGNORECASE 23 - #define O_INPUTENCODING 24 - #define O_KEYTIME 25 - #define O_LEFTRIGHT 26 - #define O_LINES 27 - #define O_LISP 28 - #define O_LIST 29 - #define O_LOCKFILES 30 - #define O_MAGIC 31 - #define O_MATCHCHARS 32 - #define O_MATCHTIME 33 - #define O_MESG 34 - #define O_MODELINE 35 - #define O_MSGCAT 36 - #define O_NOPRINT 37 - #define O_NUMBER 38 - #define O_OCTAL 39 - #define O_OPEN 40 - #define O_OPTIMIZE 41 - #define O_PARAGRAPHS 42 - #define O_PATH 43 - #define O_PRINT 44 - #define O_PROMPT 45 - #define O_READONLY 46 - #define O_RECDIR 47 - #define O_REDRAW 48 - #define O_REMAP 49 - #define O_REPORT 50 - #define O_RULER 51 - #define O_SCROLL 52 - #define O_SEARCHINCR 53 - #define O_SECTIONS 54 - #define O_SECURE 55 - #define O_SHELL 56 - #define O_SHELLMETA 57 - #define O_SHIFTWIDTH 58 - #define O_SHOWMATCH 59 - #define O_SHOWMODE 60 - #define O_SIDESCROLL 61 - #define O_SLOWOPEN 62 - #define O_SOURCEANY 63 - #define O_TABSTOP 64 - #define O_TAGLENGTH 65 - #define O_TAGS 66 - #define O_TERM 67 - #define O_TERSE 68 - #define O_TILDEOP 69 - #define O_TIMEOUT 70 - #define O_TTYWERASE 71 - #define O_VERBOSE 72 - #define O_W1200 73 - #define O_W300 74 - #define O_W9600 75 - #define O_WARN 76 - #define O_WINDOW 77 - #define O_WINDOWNAME 78 - #define O_WRAPLEN 79 - #define O_WRAPMARGIN 80 - #define O_WRAPSCAN 81 - #define O_WRITEANY 82 - #define O_OPTIONCOUNT 83 ++#define O_ALTNOTATION 0 ++#define O_ALTWERASE 1 ++#define O_AUTOINDENT 2 ++#define O_AUTOPRINT 3 ++#define O_AUTOWRITE 4 ++#define O_BACKUP 5 ++#define O_BEAUTIFY 6 ++#define O_CDPATH 7 ++#define O_CEDIT 8 ++#define O_COLUMNS 9 ++#define O_COMBINED 10 ++#define O_COMMENT 11 ++#define O_TMPDIR 12 ++#define O_EDCOMPATIBLE 13 ++#define O_ERRORBELLS 14 ++#define O_ESCAPETIME 15 ++#define O_EXPANDTAB 16 ++#define O_EXRC 17 ++#define O_EXTENDED 18 ++#define O_FILEC 19 ++#define O_FILEENCODING 20 ++#define O_FLASH 21 ++#define O_HARDTABS 22 ++#define O_ICLOWER 23 ++#define O_IGNORECASE 24 ++#define O_INPUTENCODING 25 ++#define O_KEYTIME 26 ++#define O_LEFTRIGHT 27 ++#define O_LINES 28 ++#define O_LISP 29 ++#define O_LIST 30 ++#define O_LOCKFILES 31 ++#define O_MAGIC 32 ++#define O_MATCHCHARS 33 ++#define O_MATCHTIME 34 ++#define O_MESG 35 ++#define O_MODELINE 36 ++#define O_MSGCAT 37 ++#define O_NOPRINT 38 ++#define O_NUMBER 39 ++#define O_OCTAL 40 ++#define O_OPEN 41 ++#define O_OPTIMIZE 42 ++#define O_PARAGRAPHS 43 ++#define O_PATH 44 ++#define O_PRINT 45 ++#define O_PROMPT 46 ++#define O_READONLY 47 ++#define O_RECDIR 48 ++#define O_REDRAW 49 ++#define O_REMAP 50 ++#define O_REPORT 51 ++#define O_RULER 52 ++#define O_SCROLL 53 ++#define O_SEARCHINCR 54 ++#define O_SECTIONS 55 ++#define O_SECURE 56 ++#define O_SHELL 57 ++#define O_SHELLMETA 58 ++#define O_SHIFTWIDTH 59 ++#define O_SHOWMATCH 60 ++#define O_SHOWMODE 61 ++#define O_SIDESCROLL 62 ++#define O_SLOWOPEN 63 ++#define O_SOURCEANY 64 ++#define O_TABSTOP 65 ++#define O_TAGLENGTH 66 ++#define O_TAGS 67 ++#define O_TERM 68 ++#define O_TERSE 69 ++#define O_TILDEOP 70 ++#define O_TIMEOUT 71 ++#define O_TTYWERASE 72 ++#define O_VERBOSE 73 ++#define O_W1200 74 ++#define O_W300 75 ++#define O_W9600 76 ++#define O_WARN 77 ++#define O_WINDOW 78 ++#define O_WINDOWNAME 79 ++#define O_WRAPLEN 80 ++#define O_WRAPMARGIN 81 ++#define O_WRAPSCAN 82 ++#define O_WRITEANY 83 ++#define O_OPTIONCOUNT 84
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309271615.38RGF5nT060620>