Merged in rwtolbert/pygments-main (pull request #238)

Added lexer for new Hy language, a variant of Lisp running under Python

1 files changed, 4 insertions, 2 deletions

diff --git a/pygments/lexer.py b/pygments/lexer.py
index 8f88dfda..8538fe7c 100644
--- a/pygments/lexer.py
+++ b/pygments/lexer.py
@@ -192,7 +192,9 @@ class Lexer(object):
 
     def get_tokens_unprocessed(self, text):
         """
-        Return an iterable of (tokentype, value) pairs.
+        Return an iterable of (index, tokentype, value) pairs where "index"
+        is the starting position of the token within the input text.
+
         In subclasses, implement this method as a generator to
         maximize effectiveness.
         """
@@ -673,7 +675,7 @@ class ExtendedRegexLexer(RegexLexer):
                                 if state == '#pop':
                                     ctx.stack.pop()
                                 elif state == '#push':
-                                    ctx.stack.append(statestack[-1])
+                                    ctx.stack.append(ctx.stack[-1])
                                 else:
                                     ctx.stack.append(state)
                         elif isinstance(new_state, int):