diff options
author | Tim Hatch <tim@timhatch.com> | 2014-04-14 13:47:40 -0400 |
---|---|---|
committer | Tim Hatch <tim@timhatch.com> | 2014-04-14 13:47:40 -0400 |
commit | 06a720cca67ff19f873f8066c17cf4ea90ab0f0f (patch) | |
tree | 2901fe8e218cce5a8e788645d41aec654f297e23 /pygments/token.py | |
parent | 02683b5def213065f6b893f91fc54f313141fbdf (diff) | |
parent | 5d57fe78405ac06a306f5ed2dd1b630a909cbdfb (diff) | |
download | pygments-06a720cca67ff19f873f8066c17cf4ea90ab0f0f.tar.gz |
Merged in yloiseau/pygments-main (pull request #309)
Diffstat (limited to 'pygments/token.py')
-rw-r--r-- | pygments/token.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pygments/token.py b/pygments/token.py index f6c3066d..c40ffd33 100644 --- a/pygments/token.py +++ b/pygments/token.py @@ -49,6 +49,7 @@ Token = _TokenType() # Special token types Text = Token.Text Whitespace = Text.Whitespace +Escape = Token.Escape Error = Token.Error # Text that doesn't belong to this lexer (e.g. HTML in PHP) Other = Token.Other @@ -116,6 +117,7 @@ STANDARD_TYPES = { Text: '', Whitespace: 'w', + Escape: 'esc', Error: 'err', Other: 'x', |