From nobody Thu Jan 02 09:04:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YP13x5XqBz5j0lQ; Thu, 02 Jan 2025 09:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YP13x50L8z3xVg; Thu, 2 Jan 2025 09:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VRNXbXksX+0W/O6fsEbVmG+PzteiMB15bUP6P5WdriA=; b=VT9mRCEk5CvvcfiXI7euQS+n6mxpOX9XS3Xaoh3dRyg4V1gRDcHKLAvzFW0wtRyg1wKSOJ iz15plfOr+njRS5DokTIObejA5AdBQUrp3ZPJfwLYmXF3z6i8wBIHRu446AkV8n4Bn66/6 uWdCgO8q9jXUc4ZcvQj6goLw5waBWImQRPGO570hemCg6zPyhln5D7h3DCNL1j9JZRblRe eAWjFELd9QsriqQzn1BtYOJ3FEie6l5Bwyrs3nPRkcC18TI6Dp8PU6CYEj335apSPiVD1W 5zx80PIERp9JAtGb5hBv91bPuemhOP85Ejh15OxYlFh+BvTsNEiiWyXDgw5CAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735808669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VRNXbXksX+0W/O6fsEbVmG+PzteiMB15bUP6P5WdriA=; b=QIxfF2j2wf+Yr3UQ3QtDiUHmwHoZD8l6ykjszTNQ3a60+a40c3u8RarGN29FEvcWme6if4 jxD5GW/LrZQYu92LP/H3uat0/hZtQ4o2GtpVKr5CeTU73zxQ0foeNM+9ZLHV6uGpEP7Q4D dJauEDjLvGLxwiH0d7rVFEhgn8DWgh65I1BYCBGFdtrAlha4qoNktXkjKRGAftekJOiDP4 FT0bxfuk+l878lMC7TwQ53IOEUZTTo3sJSunxtta3Z9Hpj91NmcmDM5SxWvBqxacjboaVP NzWug2cfe3RaLAJRHCKSB4+QuQqPl11/CT3S1tHtDvkEO7Dv20datWAbSupG/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735808669; a=rsa-sha256; cv=none; b=yY/NYDH3ltYH88wIxzH69CoHNuueiFoxky2bvg0vSPa2eBD+ZEKxKk82Ij0mFqUadUkCp1 4rrsm9j0tL672OoDdCGjEOsHdT5+gN9kjc60srYz3MamlR3pwA51UWRgP72JWIasUCxdoF 8Dz1+fX1eGJd6cCbz7NJ8pYG5Q2XivtgzNp59s8JwSJCiijcv8QKvwnOjp0uKwrki2/D9x QJRAni0Eu08r2KL/i4L+6OIk43U/IkPAvqy4LQ1t9ziuF9+j2y5nktpYoQ7Nrqnwbxdml5 HaHBQPApPOts9Q3JrbR5PRDZ7iB9AjXt49hESjOhj3QIOuiU6kWQ4x/z4Mp59g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YP13x4bZ1z12vc; Thu, 2 Jan 2025 09:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50294TIJ013111; Thu, 2 Jan 2025 09:04:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50294RPX013102; Thu, 2 Jan 2025 09:04:27 GMT (envelope-from git) Date: Thu, 2 Jan 2025 09:04:27 GMT Message-Id: <202501020904.50294RPX013102@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 4087ffdbce72 - main - nvi: import version 2.2.1-52c07e8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4087ffdbce725367566bc3fc60a959292daac99d Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4087ffdbce725367566bc3fc60a959292daac99d commit 4087ffdbce725367566bc3fc60a959292daac99d Merge: 2832af7b4ea2 ae7f9696aefd Author: Baptiste Daroussin AuthorDate: 2025-01-02 08:56:55 +0000 Commit: Baptiste Daroussin CommitDate: 2025-01-02 09:04:12 +0000 nvi: import version 2.2.1-52c07e8 contrib/nvi/CMakeLists.txt | 1 - contrib/nvi/common/common.h | 1 + contrib/nvi/common/log.c | 1 - contrib/nvi/common/options.c | 4 +++- contrib/nvi/man/vi.1 | 51 ++++++++++++++++++++++++-------------------- contrib/nvi/vi/vs_refresh.c | 15 +++++++++---- usr.bin/vi/options_def.h | 51 ++++++++++++++++++++++---------------------- 7 files changed, 69 insertions(+), 55 deletions(-) diff --cc usr.bin/vi/options_def.h index cd6f5ba3eb26,000000000000..15104845c380 mode 100644,000000..100644 --- a/usr.bin/vi/options_def.h +++ b/usr.bin/vi/options_def.h @@@ -1,85 -1,0 +1,86 @@@ +#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 ++#define O_SHOWFILENAME 60 ++#define O_SHOWMATCH 61 ++#define O_SHOWMODE 62 ++#define O_SIDESCROLL 63 ++#define O_SLOWOPEN 64 ++#define O_SOURCEANY 65 ++#define O_TABSTOP 66 ++#define O_TAGLENGTH 67 ++#define O_TAGS 68 ++#define O_TERM 69 ++#define O_TERSE 70 ++#define O_TILDEOP 71 ++#define O_TIMEOUT 72 ++#define O_TTYWERASE 73 ++#define O_VERBOSE 74 ++#define O_W1200 75 ++#define O_W300 76 ++#define O_W9600 77 ++#define O_WARN 78 ++#define O_WINDOW 79 ++#define O_WINDOWNAME 80 ++#define O_WRAPLEN 81 ++#define O_WRAPMARGIN 82 ++#define O_WRAPSCAN 83 ++#define O_WRITEANY 84 ++#define O_OPTIONCOUNT 85