--- a/hgext/keyword.py	Sat Mar 10 14:19:27 2018 -0800
+++ b/hgext/keyword.py	Sat Mar 10 17:02:57 2018 -0800
@@ -621,7 +621,10 @@
         origmatch = kwt.match
         kwt.match = util.never
     try:
-        for chunk in orig(web, req, tmpl):
+        res = orig(web, req, tmpl)
+        if res is web.res:
+            res = res.sendresponse()
+        for chunk in res:
             yield chunk
     finally:
         if kwt: