Enable GLOBAL tags support for nvi.

Submitted-By: Shigio Yamaguchi <shigio@wafu.netgate.net>

3 files changed, 93 insertions, 90 deletions

diff --git a/contrib/nvi/include/ex_def.h b/contrib/nvi/include/ex_def.h
index 2e69b48..56e831d 100644
--- a/contrib/nvi/include/ex_def.h
+++ b/contrib/nvi/include/ex_def.h
@@ -47,32 +47,33 @@
 #define C_RECOVER 46
 #define C_RESIZE 47
 #define C_REWIND 48
-#define C_SUBSTITUTE 49
-#define C_SCRIPT 50
-#define C_SET 51
-#define C_SHELL 52
-#define C_SOURCE 53
-#define C_STOP 54
-#define C_SUSPEND 55
-#define C_T 56
-#define C_TAG 57
-#define C_TAGNEXT 58
-#define C_TAGPOP 59
-#define C_TAGPREV 60
-#define C_TAGTOP 61
-#define C_TCLCMD 62
-#define C_UNDO 63
-#define C_UNABBREVIATE 64
-#define C_UNMAP 65
-#define C_V 66
-#define C_VERSION 67
-#define C_VISUAL_EX 68
-#define C_VISUAL_VI 69
-#define C_VIUSAGE 70
-#define C_WRITE 71
-#define C_WN 72
-#define C_WQ 73
-#define C_XIT 74
-#define C_YANK 75
-#define C_Z 76
-#define C_SUBTILDE 77
+#define C_RTAG 49
+#define C_SUBSTITUTE 50
+#define C_SCRIPT 51
+#define C_SET 52
+#define C_SHELL 53
+#define C_SOURCE 54
+#define C_STOP 55
+#define C_SUSPEND 56
+#define C_T 57
+#define C_TAG 58
+#define C_TAGNEXT 59
+#define C_TAGPOP 60
+#define C_TAGPREV 61
+#define C_TAGTOP 62
+#define C_TCLCMD 63
+#define C_UNDO 64
+#define C_UNABBREVIATE 65
+#define C_UNMAP 66
+#define C_V 67
+#define C_VERSION 68
+#define C_VISUAL_EX 69
+#define C_VISUAL_VI 70
+#define C_VIUSAGE 71
+#define C_WRITE 72
+#define C_WN 73
+#define C_WQ 74
+#define C_XIT 75
+#define C_YANK 76
+#define C_Z 77
+#define C_SUBTILDE 78
diff --git a/contrib/nvi/include/ex_extern.h b/contrib/nvi/include/ex_extern.h
index ed01701..ce09b1c 100644
--- a/contrib/nvi/include/ex_extern.h
+++ b/contrib/nvi/include/ex_extern.h
@@ -89,6 +89,7 @@ int re_compile __P((SCR *,
     char *, size_t, char **, size_t *, regex_t *, u_int));
 void re_error __P((SCR *, int, regex_t *));
 int ex_tag_first __P((SCR *, char *));
+int ex_rtag_push __P((SCR *, EXCMD *));
 int ex_tag_push __P((SCR *, EXCMD *));
 int ex_tag_next __P((SCR *, EXCMD *));
 int ex_tag_prev __P((SCR *, EXCMD *));
diff --git a/contrib/nvi/include/options_def.h b/contrib/nvi/include/options_def.h
index 089fa7f..d2e637c 100644
--- a/contrib/nvi/include/options_def.h
+++ b/contrib/nvi/include/options_def.h
@@ -16,64 +16,65 @@
 #define O_EXTENDED 15
 #define O_FILEC 16
 #define O_FLASH 17
-#define O_HARDTABS 18
-#define O_ICLOWER 19
-#define O_IGNORECASE 20
-#define O_KEYTIME 21
-#define O_LEFTRIGHT 22
-#define O_LINES 23
-#define O_LISP 24
-#define O_LIST 25
-#define O_LOCKFILES 26
-#define O_MAGIC 27
-#define O_MATCHTIME 28
-#define O_MESG 29
-#define O_MODELINE 30
-#define O_MSGCAT 31
-#define O_NOPRINT 32
-#define O_NUMBER 33
-#define O_OCTAL 34
-#define O_OPEN 35
-#define O_OPTIMIZE 36
-#define O_PARAGRAPHS 37
-#define O_PATH 38
-#define O_PRINT 39
-#define O_PROMPT 40
-#define O_READONLY 41
-#define O_RECDIR 42
-#define O_REDRAW 43
-#define O_REMAP 44
-#define O_REPORT 45
-#define O_RULER 46
-#define O_SCROLL 47
-#define O_SEARCHINCR 48
-#define O_SECTIONS 49
-#define O_SECURE 50
-#define O_SHELL 51
-#define O_SHELLMETA 52
-#define O_SHIFTWIDTH 53
-#define O_SHOWMATCH 54
-#define O_SHOWMODE 55
-#define O_SIDESCROLL 56
-#define O_SLOWOPEN 57
-#define O_SOURCEANY 58
-#define O_TABSTOP 59
-#define O_TAGLENGTH 60
-#define O_TAGS 61
-#define O_TERM 62
-#define O_TERSE 63
-#define O_TILDEOP 64
-#define O_TIMEOUT 65
-#define O_TTYWERASE 66
-#define O_VERBOSE 67
-#define O_W1200 68
-#define O_W300 69
-#define O_W9600 70
-#define O_WARN 71
-#define O_WINDOW 72
-#define O_WINDOWNAME 73
-#define O_WRAPLEN 74
-#define O_WRAPMARGIN 75
-#define O_WRAPSCAN 76
-#define O_WRITEANY 77
-#define O_OPTIONCOUNT 78
+#define O_GTAGSMODE 18
+#define O_HARDTABS 19
+#define O_ICLOWER 20
+#define O_IGNORECASE 21
+#define O_KEYTIME 22
+#define O_LEFTRIGHT 23
+#define O_LINES 24
+#define O_LISP 25
+#define O_LIST 26
+#define O_LOCKFILES 27
+#define O_MAGIC 28
+#define O_MATCHTIME 29
+#define O_MESG 30
+#define O_MODELINE 31
+#define O_MSGCAT 32
+#define O_NOPRINT 33
+#define O_NUMBER 34
+#define O_OCTAL 35
+#define O_OPEN 36
+#define O_OPTIMIZE 37
+#define O_PARAGRAPHS 38
+#define O_PATH 39
+#define O_PRINT 40
+#define O_PROMPT 41
+#define O_READONLY 42
+#define O_RECDIR 43
+#define O_REDRAW 44
+#define O_REMAP 45
+#define O_REPORT 46
+#define O_RULER 47
+#define O_SCROLL 48
+#define O_SEARCHINCR 49
+#define O_SECTIONS 50
+#define O_SECURE 51
+#define O_SHELL 52
+#define O_SHELLMETA 53
+#define O_SHIFTWIDTH 54
+#define O_SHOWMATCH 55
+#define O_SHOWMODE 56
+#define O_SIDESCROLL 57
+#define O_SLOWOPEN 58
+#define O_SOURCEANY 59
+#define O_TABSTOP 60
+#define O_TAGLENGTH 61
+#define O_TAGS 62
+#define O_TERM 63
+#define O_TERSE 64
+#define O_TILDEOP 65
+#define O_TIMEOUT 66
+#define O_TTYWERASE 67
+#define O_VERBOSE 68
+#define O_W1200 69
+#define O_W300 70
+#define O_W9600 71
+#define O_WARN 72
+#define O_WINDOW 73
+#define O_WINDOWNAME 74
+#define O_WRAPLEN 75
+#define O_WRAPMARGIN 76
+#define O_WRAPSCAN 77
+#define O_WRITEANY 78
+#define O_OPTIONCOUNT 79