summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatth?us G. Chajdas <dev@anteru.net>2019-05-21 18:10:56 +0200
committerMatth?us G. Chajdas <dev@anteru.net>2019-05-21 18:10:56 +0200
commitdcbf0c89d9ff12723d21410104b40739689e7afd (patch)
treeefdc6a469a172c4ca6542b24ed4f0f265c714fd2
parent52dd1cba99c9f4f3495ee1e9b93ee615b80ba880 (diff)
downloadpygments-dcbf0c89d9ff12723d21410104b40739689e7afd.tar.gz
Backed out changeset: df3df829861d
-rw-r--r--CHANGES2
-rw-r--r--pygments/formatters/html.py8
2 files changed, 1 insertions, 9 deletions
diff --git a/CHANGES b/CHANGES
index eaf47510..d0da916d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,8 +19,6 @@ Version 2.4.1
- Support CSS variables in stylesheets (PR#814)
- Fix F# lexer name (PR#709)
- Fix ``TerminalFormatter`` using bold for bright text (#1480)
-- Don't emit a trailing newline in the HtmlFormatter when ``nowrap`` is set
- (#1514)
Version 2.4.0
-------------
diff --git a/pygments/formatters/html.py b/pygments/formatters/html.py
index 54e7df0e..d65c09ce 100644
--- a/pygments/formatters/html.py
+++ b/pygments/formatters/html.py
@@ -803,13 +803,7 @@ class HtmlFormatter(Formatter):
# else we neither have to open a new span nor set lspan
if line:
- # If we're in nowrap mode, we try to make the output compact and
- # omit the trailing newspace, this makes it easier to consume the
- # HTML elsewhere
- if self.nowrap:
- line.append(lspan and '</span>')
- else:
- line.extend((lspan and '</span>', lsep))
+ line.extend(((lspan and '</span>'), lsep))
yield 1, ''.join(line)
def _lookup_ctag(self, token):