--- a/tests/test-command-template.t	Thu Oct 01 12:07:20 2015 -0500
+++ b/tests/test-command-template.t	Mon Oct 05 12:37:26 2015 -0400
@@ -3368,6 +3368,11 @@
   hg: parse error: word expects an integer index
   [255]
 
+Test word for out of range
+
+  $ hg log -R a --template "{word(10000, desc)}"
+  $ hg log -R a --template "{word(-10000, desc)}"
+
 Test indent and not adding to empty lines
 
   $ hg log -T "-----\n{indent(desc, '>> ', ' > ')}\n" -r 0:1 -R a