summaryrefslogtreecommitdiff
path: root/doc/docs
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
commit8194c67d27cc253f9ba4e2aa0f085a2f4cccf26c (patch)
tree1b8bed2709d0890d82a558ef052db8497b337002 /doc/docs
parentcc9d03dc3ec8e1decbbbddee7f0eb9f7bffef781 (diff)
parent24510424aa0cf824450a874f45b36b5fa870f3e6 (diff)
downloadpygments-git-8194c67d27cc253f9ba4e2aa0f085a2f4cccf26c.tar.gz
Merged birkenfeld/pygments-main into default
Diffstat (limited to 'doc/docs')
-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
========