summaryrefslogtreecommitdiff
path: root/doc
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 /doc
parent1b491356e14fe2dc89e51dad0e6094e7aac068e7 (diff)
parent9b7051b04820a9a0c5f19ed717d363d2fe86275a (diff)
downloadpygments-b1278a8e06387fc444daeb0dee22d99e7d2bd563.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
========