$NetBSD: patch-aw,v 1.3 2013/01/23 17:26:08 wiz Exp $

--- vi/v_ex.c.orig	2007-11-19 03:41:42.000000000 +1100
+++ vi/v_ex.c
@@ -209,6 +209,9 @@ v_tagpush(SCR *sp, VICMD *vp)
 {
 	EXCMD cmd;
 
+	if (O_ISSET(sp, O_GTAGSMODE) && vp->m_start.cno == 0)
+		ex_cinit(sp, &cmd, C_RTAG, 0, OOBLNO, 0, 0);
+	else
 	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, 0, 0);
 	argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw) + 1);
 	return (v_exec_ex(sp, vp, &cmd));
@@ -521,6 +524,7 @@ v_ecl(SCR *sp)
 
 	new->frp = wp->ccl_sp->frp;
 	new->frp->flags = sp->frp->flags;
+	new->conv = wp->ccl_sp->conv;
 
 	/* Move the cursor to the end. */
 	(void)db_last(new, &new->lno);