summaryrefslogtreecommitdiff
path: root/pygments/token.py
diff options
context:
space:
mode:
authorMiikka Salminen <miikka.salminen@gmail.com>2016-01-20 11:40:31 +0200
committerMiikka Salminen <miikka.salminen@gmail.com>2016-01-20 11:40:31 +0200
commitb1278a8e06387fc444daeb0dee22d99e7d2bd563 (patch)
tree30e73e61d9d239144e07e1c8b5cfb22a0bb2709c /pygments/token.py
parent1b491356e14fe2dc89e51dad0e6094e7aac068e7 (diff)
parent9b7051b04820a9a0c5f19ed717d363d2fe86275a (diff)
downloadpygments-b1278a8e06387fc444daeb0dee22d99e7d2bd563.tar.gz
Merged birkenfeld/pygments-main into default
Diffstat (limited to 'pygments/token.py')
-rw-r--r--pygments/token.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pygments/token.py b/pygments/token.py
index f31625ed..aea6301c 100644
--- a/pygments/token.py
+++ b/pygments/token.py
@@ -139,6 +139,7 @@ STANDARD_TYPES = {
Name.Entity: 'ni',
Name.Exception: 'ne',
Name.Function: 'nf',
+ Name.Function.Magic: 'fm',
Name.Property: 'py',
Name.Label: 'nl',
Name.Namespace: 'nn',
@@ -148,6 +149,7 @@ STANDARD_TYPES = {
Name.Variable.Class: 'vc',
Name.Variable.Global: 'vg',
Name.Variable.Instance: 'vi',
+ Name.Variable.Magic: 'vm',
Literal: 'l',
Literal.Date: 'ld',