diff --git a/demo/anywordhint.html b/demo/anywordhint.html
index 471b5bde7b..57df9a36a7 100644
--- a/demo/anywordhint.html
+++ b/demo/anywordhint.html
@@ -8,7 +8,7 @@
 <link rel="stylesheet" href="../addon/hint/show-hint.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/hint/show-hint.js"></script>
-<script src="../addon/hint/anyword-hint.js"></script>
+<script src="../addon/hint/anyword-hint.js" id=anyword></script>
 <script src="../mode/javascript/javascript.js"></script>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
@@ -29,33 +29,31 @@ <h2>Any Word Completion Demo</h2>
 (function() {
   "use strict";
 
-  var WORD = /[\w$]+/g, RANGE = 500;
+  var WORD = /[\w$]+/, RANGE = 500;
 
   CodeMirror.registerHelper("hint", "anyword", function(editor, options) {
     var word = options && options.word || WORD;
     var range = options && options.range || RANGE;
     var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
-    var start = cur.ch, end = start;
-    while (end < curLine.length && word.test(curLine.charAt(end))) ++end;
+    var end = cur.ch, start = end;
     while (start && word.test(curLine.charAt(start - 1))) --start;
     var curWord = start != end && curLine.slice(start, end);
 
-    var list = [], seen = {};
-    function scan(dir) {
-      var line = cur.line, end = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
-      for (; line != end; line += dir) {
+    var list = options && options.list || [], seen = {};
+    var re = new RegExp(word.source, "g");
+    for (var dir = -1; dir <= 1; dir += 2) {
+      var line = cur.line, endLine = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
+      for (; line != endLine; line += dir) {
         var text = editor.getLine(line), m;
-        word.lastIndex = 0;
-        while (m = word.exec(text)) {
-          if ((!curWord || m[0].indexOf(curWord) == 0) && !seen.hasOwnProperty(m[0])) {
+        while (m = re.exec(text)) {
+          if (line == cur.line && m[0] === curWord) continue;
+          if ((!curWord || m[0].lastIndexOf(curWord, 0) == 0) && !Object.prototype.hasOwnProperty.call(seen, m[0])) {
             seen[m[0]] = true;
             list.push(m[0]);
           }
         }
       }
     }
-    scan(-1);
-    scan(1);
     return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
   });
 })();