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
commit24510424aa0cf824450a874f45b36b5fa870f3e6 (patch)
treed997a94f3f1d33f7da30f1e8d5152c11c8432bea /doc
parentf4e4db3b4ade5d5f6d33c3dac4447f25690c6726 (diff)
parentd395701a43fba9504c9373cee7ca829cbf766065 (diff)
downloadpygments-git-24510424aa0cf824450a874f45b36b5fa870f3e6.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
========