summaryrefslogtreecommitdiff
path: root/doc
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 /doc
parentfb564416e672bfa554638293f93d86283da97d26 (diff)
parentb1278a8e06387fc444daeb0dee22d99e7d2bd563 (diff)
downloadpygments-a109fab994438a6323df468f1e16c5a1387008fc.tar.gz
Merged birkenfeld/pygments-main into default
Diffstat (limited to 'doc')
-rw-r--r--doc/docs/tokens.rst8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/docs/tokens.rst b/doc/docs/tokens.rst
index 6455a501..f9ed3d92 100644
--- a/doc/docs/tokens.rst
+++ b/doc/docs/tokens.rst
@@ -174,6 +174,10 @@ Name Tokens
`Name.Function`
Token type for function names.
+`Name.Function.Magic`
+ same as `Name.Function` but for function names that have an implicit use in
+ a language (e.g. ``__init__`` method in Python).
+
`Name.Label`
Token type for label names (e.g. in languages that support ``goto``).
@@ -201,6 +205,10 @@ Name Tokens
`Name.Variable.Instance`
same as `Name.Variable` but for instance variables.
+`Name.Variable.Magic`
+ same as `Name.Variable` but for variable names that have an implicit use in
+ a language (e.g. ``__doc__`` in Python).
+
Literals
========