Map \envvar to the TeXinfo equivalent, @env.
diff --git a/Doc/tools/py2texi.el b/Doc/tools/py2texi.el
index f35bfd1..b117cad 100644
--- a/Doc/tools/py2texi.el
+++ b/Doc/tools/py2texi.el
@@ -246,7 +246,7 @@
     ("EOF" 0 "@code{EOF}")
     ("email" 1 "@email{\\1}")
     ("emph" 1 "@emph{\\1}")
-    ("envvar" 1 "@samp{\\1}")
+    ("envvar" 1 "@env{\\1}")
     ("exception" 1 "@code{\\1}")
     ("exindex" 1 (progn (setq obindex t) "@obindex{\\1}"))
     ("fi" 0 (concat "@end " last-if))