[src/trunk]: src/external/bsd/nvi/dist/common Fix corruption in numbering of ...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/32e26ce5a956
branches:  trunk
changeset: 357324:32e26ce5a956
user:      rin <rin%NetBSD.org@localhost>
date:      Mon Nov 06 03:17:37 2017 +0000

description:
Fix corruption in numbering of options without GTAGS compile-time option.
Now nvi works without GTAGS.

diffstat:

 external/bsd/nvi/dist/common/options.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 96341456874f -r 32e26ce5a956 external/bsd/nvi/dist/common/options.c
--- a/external/bsd/nvi/dist/common/options.c    Mon Nov 06 03:10:26 2017 +0000
+++ b/external/bsd/nvi/dist/common/options.c    Mon Nov 06 03:17:37 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: options.c,v 1.3 2014/01/26 21:43:45 christos Exp $ */
+/*     $NetBSD: options.c,v 1.4 2017/11/06 03:17:37 rin Exp $ */
 /*-
  * Copyright (c) 1991, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
@@ -16,7 +16,7 @@
 static const char sccsid[] = "Id: options.c,v 10.65 2002/01/18 22:34:43 skimo Exp  (Berkeley) Date: 2002/01/18 22:34:43 ";
 #endif /* not lint */
 #else
-__RCSID("$NetBSD: options.c,v 1.3 2014/01/26 21:43:45 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.4 2017/11/06 03:17:37 rin Exp $");
 #endif
 
 #include <sys/types.h>
@@ -100,9 +100,11 @@
        {L("fileencoding"),f_encoding,  OPT_STR,        OPT_WC},
 /* O_FLASH         HPUX */
        {L("flash"),    NULL,           OPT_1BOOL,      0},
+/* O_GTAGSMODE     FreeBSD/NetBSD */
 #ifdef GTAGS
-/* O_GTAGSMODE     FreeBSD/NetBSD */
        {L("gtagsmode"),NULL,           OPT_0BOOL,      0},
+#else
+       {L("gtagsmode"),NULL,           OPT_0BOOL,      OPT_NDISP|OPT_NOSAVE|OPT_NOSET},
 #endif
 /* O_HARDTABS      4BSD */
        {L("hardtabs"), NULL,           OPT_NUM,        0},