summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pygments/formatters/html.py5
-rw-r--r--pygments/lexers/agile.py2
2 files changed, 5 insertions, 2 deletions
diff --git a/pygments/formatters/html.py b/pygments/formatters/html.py
index e1f0a478..97165d00 100644
--- a/pygments/formatters/html.py
+++ b/pygments/formatters/html.py
@@ -459,12 +459,15 @@ class HtmlFormatter(Formatter):
else:
yield 1, cspan + part + (cspan and '</span>') + lsep
# for the last line
- if line:
+ if line and parts[-1]:
if lspan != cspan:
line += (lspan and '</span>') + cspan + parts[-1]
lspan = cspan
else:
line += parts[-1]
+ elif line:
+ # we neither have to open a new span nor set lspan
+ pass
else:
line = cspan + parts[-1]
lspan = cspan
diff --git a/pygments/lexers/agile.py b/pygments/lexers/agile.py
index b8b737ca..d19e79ca 100644
--- a/pygments/lexers/agile.py
+++ b/pygments/lexers/agile.py
@@ -239,7 +239,7 @@ class PythonTracebackLexer(RegexLexer):
(r'^( )(.+)(\n)',
bygroups(Text, using(PythonLexer), Text)),
(r'^(...)(\n)',
- bygroups(Comment, Text), '#pop'), # for doctests...
+ bygroups(Comment, Text)), # for doctests...
(r'^(.+)(: )(.+)(\n)',
bygroups(Name.Class, Text, Name.Identifier, Text), '#pop'),
],