Merge remote-tracking branch 'danr/Document-that-markup-is-possible-in-completion-menu-entries'

This commit is contained in:
Maxime Coste 2017-05-19 21:43:17 +01:00
commit 8c62b670fd
2 changed files with 2 additions and 2 deletions

View File

@ -873,7 +873,7 @@ Options are typed, their type can be
* `completions`: a `:` separated list of `<text>|<docstring>|<menu text>` * `completions`: a `:` separated list of `<text>|<docstring>|<menu text>`
candidates, except for the first element which follows the candidates, except for the first element which follows the
`<line>.<column>[+<length>]@<timestamp>` format to define where the `<line>.<column>[+<length>]@<timestamp>` format to define where the
completion apply in the buffer. completion apply in the buffer. Markup can be used in the menu text.
* `enum(value1|value2|...)`: an enum, taking on of the given values * `enum(value1|value2|...)`: an enum, taking on of the given values
* `flags(value1|value2|...)`: a set of flags, taking a combination * `flags(value1|value2|...)`: a set of flags, taking a combination
of the given values joined by `|`. of the given values joined by `|`.

View File

@ -34,7 +34,7 @@ Types
a `:` separated list of `<text>|<docstring>|<menu text>` a `:` separated list of `<text>|<docstring>|<menu text>`
candidates, except for the first element which follows the candidates, except for the first element which follows the
`<line>.<column>[+<length>]@<timestamp>` format to define where the `<line>.<column>[+<length>]@<timestamp>` format to define where the
completion apply in the buffer. completion apply in the buffer. Markup can be used in the menu text.
*enum(value1|value2|...)*:: *enum(value1|value2|...)*::
an enum, taking one of the given values an enum, taking one of the given values
*flags(value1|value2|...)*:: *flags(value1|value2|...)*::