summaryrefslogtreecommitdiff
path: root/pygments/token.py
diff options
context:
space:
mode:
authorMiikka Salminen <miikka.salminen@gmail.com>2016-02-03 19:28:10 +0200
committerMiikka Salminen <miikka.salminen@gmail.com>2016-02-03 19:28:10 +0200
commita109fab994438a6323df468f1e16c5a1387008fc (patch)
treef3e900739cc83c90ea038be5e68fa7c7c3420018 /pygments/token.py
parentfb564416e672bfa554638293f93d86283da97d26 (diff)
parentb1278a8e06387fc444daeb0dee22d99e7d2bd563 (diff)
downloadpygments-a109fab994438a6323df468f1e16c5a1387008fc.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 fa3b1e11..097ff064 100644
--- a/pygments/token.py
+++ b/pygments/token.py
@@ -147,6 +147,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',
@@ -156,6 +157,7 @@ STANDARD_TYPES = {
Name.Variable.Class: 'vc',
Name.Variable.Global: 'vg',
Name.Variable.Instance: 'vi',
+ Name.Variable.Magic: 'vm',
Literal: 'l',
Literal.Date: 'ld',