Permalink
Browse files

Merge remote-tracking branch 'alexherbo2/command-names'

  • Loading branch information...
2 parents 1d30794 + 671b50b commit 343df600cb9e0ffb8ba188e739ab3fcf86253938 @mawww committed Jan 10, 2017
Showing with 871 additions and 871 deletions.
  1. +47 −47 README.asciidoc
  2. +41 −41 doc/manpages/highlighters.asciidoc
  3. +2 −2 doc/manpages/hooks.asciidoc
  4. +1 −1 rc/base/autowrap.kak
  5. +7 −7 rc/base/clojure.kak
  6. +14 −14 rc/base/css.kak
  7. +1 −1 rc/base/ctags.kak
  8. +22 −22 rc/base/d.kak
  9. +31 −31 rc/base/etc.kak
  10. +11 −11 rc/base/fish.kak
  11. +15 −15 rc/base/gas.kak
  12. +11 −11 rc/base/git.kak
  13. +15 −15 rc/base/go.kak
  14. +12 −12 rc/base/haskell.kak
  15. +11 −11 rc/base/html.kak
  16. +6 −6 rc/base/ini.kak
  17. +9 −9 rc/base/java.kak
  18. +16 −16 rc/base/javascript.kak
  19. +7 −7 rc/base/json.kak
  20. +8 −8 rc/base/julia.kak
  21. +4 −4 rc/base/lint.kak
  22. +11 −11 rc/base/lisp.kak
  23. +8 −8 rc/base/lua.kak
  24. +6 −6 rc/base/mail.kak
  25. +62 −62 rc/base/markdown.kak
  26. +25 −25 rc/base/perl.kak
  27. +22 −22 rc/base/ruby.kak
  28. +14 −14 rc/base/rust.kak
  29. +14 −14 rc/base/scala.kak
  30. +1 −1 rc/base/spell.kak
  31. +15 −15 rc/base/swift.kak
  32. +11 −11 rc/base/yaml.kak
  33. +13 −13 rc/core/asciidoc.kak
  34. +34 −34 rc/core/c-family.kak
  35. +6 −6 rc/core/diff.kak
  36. +6 −6 rc/core/grep.kak
  37. +14 −14 rc/core/kakrc.kak
  38. +8 −8 rc/core/make.kak
  39. +9 −9 rc/core/makefile.kak
  40. +7 −7 rc/core/man.kak
  41. +13 −13 rc/core/python.kak
  42. +12 −12 rc/core/sh.kak
  43. +1 −1 rc/extra/autorestore.kak
  44. +9 −9 rc/extra/cabal.kak
  45. +5 −5 rc/extra/clang.kak
  46. +18 −18 rc/extra/coffee.kak
  47. +9 −9 rc/extra/cucumber.kak
  48. +10 −10 rc/extra/dockerfile.kak
  49. +54 −54 rc/extra/exherbo.kak
  50. +12 −12 rc/extra/git-tools.kak
  51. +1 −1 rc/extra/go-tools.kak
  52. +11 −11 rc/extra/haml.kak
  53. +12 −12 rc/extra/hbs.kak
  54. +1 −1 rc/extra/jedi.kak
  55. +17 −17 rc/extra/kickstart.kak
  56. +9 −9 rc/extra/latex.kak
  57. +12 −12 rc/extra/moon.kak
  58. +14 −14 rc/extra/php.kak
  59. +17 −17 rc/extra/pug.kak
  60. +11 −11 rc/extra/ragel.kak
  61. +13 −13 rc/extra/sass.kak
  62. +7 −7 rc/extra/scss.kak
  63. +9 −9 rc/extra/taskpaper.kak
  64. +11 −11 rc/extra/tupfile.kak
  65. +1 −1 src/commands.cc
  66. +4 −4 test/highlight/regions/rc
  67. +1 −1 test/regression/638-highlight-codepoint-with-bracket/rc
View
@@ -1201,25 +1201,25 @@ Highlighters
Manipulation of the displayed text is done through highlighters, which can be added
or removed with the command
------------------------------------------------------
-:addhl <highlighter_name> <highlighter_parameters...>
------------------------------------------------------
+---------------------------------------------------------------
+:add-highlighter <highlighter_name> <highlighter_parameters...>
+---------------------------------------------------------------
and
-----------------------
-:rmhl <highlighter_id>
-----------------------
+------------------------------------
+:remove-highlighter <highlighter_id>
+------------------------------------
`highlighter_id` is a name generated by the highlighter specified with `highlighter_name`,
-possibly dependent on the parameters. Use command completion on rmhl to see the existing
+possibly dependent on the parameters. Use command completion on remove-highlighter to see the existing
highlighters id.
general highlighters are:
* `regex <ex> <capture_id>:<face>...`: highlight a regex, takes the regex as
first parameter, followed by any number of face parameters.
- For example: `:addhl regex (\hTODO:)?[^\n] 0:cyan 1:yellow,red`
+ For example: `:add-highlighter regex (\hTODO:)?[^\n] 0:cyan 1:yellow,red`
will highlight C++ style comments in cyan, with an eventual 'TODO:' in
yellow on red background.
* `dynregex`: Similar to regex, but expand (like a command parameter would) the
@@ -1243,23 +1243,23 @@ Highlighting Groups
the `group` highlighter is a container for other highlighters. You can add
a group to the current window using
-------------------
-addhl group <name>
-------------------
+----------------------------
+add-highlighter group <name>
+----------------------------
-and then the `-group` switch of `addhl` provides a mean to add highlighters
+and then the `-group` switch of `add-highlighter` provides a mean to add highlighters
inside this group.
---------------------------------------
-addhl -group <name> <type> <params>...
---------------------------------------
+------------------------------------------------
+add-highlighter -group <name> <type> <params>...
+------------------------------------------------
groups can contain other groups, the `-group` switch can be used to define a path.
-------------------------------------------------
-addhl -group <name> group <subname>
-addhl -group <name>/<subname> <type> <params>...
-------------------------------------------------
+----------------------------------------------------------
+add-highlighter -group <name> group <subname>
+add-highlighter -group <name>/<subname> <type> <params>...
+----------------------------------------------------------
[[regions-highlighters]]
Regions highlighters
@@ -1291,16 +1291,16 @@ shell_expand %sh\{ \} \{
Regions are used in the `regions` highlighter which can take any number
of regions.
------------------------------------------------------------------------
-addhl regions <name> <region_name1> <opening1> <closing1> <recurse1> \
+---------------------------------------------------------------------------------
+add-highlighter regions <name> <region_name1> <opening1> <closing1> <recurse1> \
<region_name2> <opening2> <closing2> <recurse2>...
------------------------------------------------------------------------
+---------------------------------------------------------------------------------
defines multiple regions in which other highlighters can be added
--------------------------------------
-addhl -group <name>/<region_name> ...
--------------------------------------
+-----------------------------------------------
+add-highlighter -group <name>/<region_name> ...
+-----------------------------------------------
Regions are matched using the left-most rule: the left-most region opening starts
a new region. when a region closes, the closest next opening start another region.
@@ -1314,13 +1314,13 @@ Most programming languages can then be properly highlighted using a `regions`
highlighter as root:
-----------------------------------------------------------------
-addhl regions -default code <lang> \
+add-highlighter regions -default code <lang> \
string <str_opening> <str_closing> <str_recurse> \
comment <comment_opening> <comment_closing> <comment_recurse>
-addhl -group <lang>/code ...
-addhl -group <lang>/string ...
-addhl -group <lang>/comment ...
+add-highlighter -group <lang>/code ...
+add-highlighter -group <lang>/string ...
+add-highlighter -group <lang>/comment ...
-----------------------------------------------------------------
Shared Highlighters
@@ -1329,28 +1329,28 @@ Shared Highlighters
Highlighters are often defined for a specific filetype, and it makes then sense to
share the highlighters between all the windows on the same filetypes.
-A shared highlighter can be defined with the `:addhl` command
+A shared highlighter can be defined with the `:add-highlighter` command
-------------------------------
-addhl -group /<group_name> ...
-------------------------------
+----------------------------------------
+add-highlighter -group /<group_name> ...
+----------------------------------------
when the group switch values starts with a '/', it references a group in the
shared highlighters, rather than the window highlighters.
The common case would be to create a named shared group, and then fill it
with highlighters:
----------------------------
-addhl -group / group <name>
-addhl -group /name regex ...
----------------------------
+--------------------------------------
+add-highlighter -group / group <name>
+add-highlighter -group /name regex ...
+--------------------------------------
It can then be referenced in a window using the `ref` highlighter.
-----------------
-addhl ref <name>
-----------------
+--------------------------
+add-highlighter ref <name>
+--------------------------
the `ref` can reference any named highlighter in the shared namespace.
@@ -1374,16 +1374,16 @@ called.
For example to automatically use line numbering with .cc files,
use the following command:
------------------------------------------------------
-:hook global WinCreate .*\.cc %{ addhl number_lines }
------------------------------------------------------
+---------------------------------------------------------------
+:hook global WinCreate .*\.cc %{ add-highlighter number_lines }
+---------------------------------------------------------------
if `<group>` is given, make this hook part of the named group. groups
-are used for removing hooks with the `rmhooks` command
+are used for removing hooks with the `remove-hooks` command
------------------------
-rmhooks <scope> <group>
------------------------
+----------------------------
+remove-hooks <scope> <group>
+----------------------------
will remove every hooks in `<scope>` that are part of the given group.
@@ -11,19 +11,19 @@ Description
Manipulation of the displayed text is done through highlighters, which can
be added or removed with the following commands:
--------------------------------------------------------
-addhl <highlighter_name> <highlighter_parameters> ...
--------------------------------------------------------
+---------------------------------------------------------------
+add-highlighter <highlighter_name> <highlighter_parameters> ...
+---------------------------------------------------------------
and
------------------------
-rmhl <highlighter_id>
------------------------
+-----------------------------------
+remove-highlighter <highlighter_id>
+-----------------------------------
*highlighter_id* is a name generated by the highlighter specified with
*highlighter_name*, possibly dependent on the parameters. Use command
-completion in a prompt on the *rmhl* command to see the existing highlighters
+completion in a prompt on the *remove-highlighter* command to see the existing highlighters
ids.
General highlighters
@@ -32,9 +32,9 @@ General highlighters
highlight a regex, takes the regex as first parameter, followed by
any number of face parameters. For example:
------------------------------------------------------
- addhl regex //(\hTODO:)?[^\n] 0:cyan 1:yellow,red
------------------------------------------------------
+---------------------------------------------------------------
+ add-highlighter regex //(\hTODO:)?[^\n] 0:cyan 1:yellow,red
+---------------------------------------------------------------
will highlight C++ style comments in cyan, with an eventual 'TODO:'
in yellow on red background
@@ -81,24 +81,24 @@ Highlighting Groups
The group highlighter is a container for other highlighters. You can add a
group to the current window using
---------------------
-addhl group <name>
---------------------
+----------------------------
+add-highlighter group <name>
+----------------------------
-The *-group* switch of the *addhl* command provides a mean to add highlighters
+The *-group* switch of the *add-highlighter* command provides a mean to add highlighters
inside this group:
-----------------------------------------
-addhl -group <name> <type> <params>...
-----------------------------------------
+------------------------------------------------
+add-highlighter -group <name> <type> <params>...
+------------------------------------------------
Groups can contain other groups, the *-group* switch can be used to define
a path as follows:
---------------------------------------------------
-addhl -group <name> group <subname>
-addhl -group <name>/<subname> <type> <params>...
---------------------------------------------------
+----------------------------------------------------------
+add-highlighter -group <name> group <subname>
+add-highlighter -group <name>/<subname> <type> <params>...
+----------------------------------------------------------
Regions highlighters
--------------------
@@ -140,16 +140,16 @@ of regions.
The following command:
------------------------------------------------------------------------
-addhl regions <name> <region_name1> <opening1> <closing1> <recurse1>
+------------------------------------------------------------------------------
+add-highlighter regions <name> <region_name1> <opening1> <closing1> <recurse1>
<region_name2> <opening2> <closing2> <recurse2>...
------------------------------------------------------------------------
+------------------------------------------------------------------------------
defines multiple regions in which other highlighters can be added as follows:
----------------------------------------
-addhl -group <name>/<region_name> ...
----------------------------------------
+-----------------------------------------------
+add-highlighter -group <name>/<region_name> ...
+-----------------------------------------------
Regions are matched using the left-most rule: the left-most region opening
starts a new region. When a region closes, the closest next opening start
@@ -164,13 +164,13 @@ Most programming languages can then be properly highlighted using a regions
highlighter as root:
-----------------------------------------------------------------
-addhl regions -default code <lang> \
+add-highlighter regions -default code <lang> \
string <str_opening> <str_closing> <str_recurse> \
comment <comment_opening> <comment_closing> <comment_recurse>
-addhl -group <lang>/code ...
-addhl -group <lang>/string ...
-addhl -group <lang>/comment ...
+add-highlighter -group <lang>/code ...
+add-highlighter -group <lang>/string ...
+add-highlighter -group <lang>/comment ...
-----------------------------------------------------------------
Shared Highlighters
@@ -181,25 +181,25 @@ sense to share the highlighters between all the windows on the same filetypes.
A shared highlighter can be defined with the following command:
---------------------------------
-addhl -group /<group_name> ...
---------------------------------
+----------------------------------------
+add-highlighter -group /<group_name> ...
+----------------------------------------
When the group switch values starts with a '/', it references a group in
the shared highlighters, rather than the window highlighters.
The common case would be to create a named shared group, and then fill it
with highlighters:
-------------------------------
-addhl -group / group <name>
-addhl -group /name regex ...
-------------------------------
+--------------------------------------
+add-highlighter -group / group <name>
+add-highlighter -group /name regex ...
+--------------------------------------
It can then be referenced in a window using the ref highlighter.
-------------------
-addhl ref <name>
-------------------
+--------------------------
+add-highlighter ref <name>
+--------------------------
The ref can reference any named highlighter in the shared namespace.
@@ -25,14 +25,14 @@ For example to automatically use line numbering with .cc files, use the
following command:
----------------------------------------------------
-hook global WinCreate .*\.cc %{ addhl number_lines }
+hook global WinCreate .*\.cc %{ add-highlighter number_lines }
----------------------------------------------------
if *group* is given, make this hook part of the named group. Groups are used
for removing hooks with the following command:
-----------------------
-rmhooks <scope> <group>
+remove-hooks <scope> <group>
-----------------------
A call to the command above will remove every hooks in *scope* that are part
@@ -43,5 +43,5 @@ def autowrap-enable -docstring "Automatically wrap the lines in which characters
}
def autowrap-disable -docstring "Disable automatic line wrapping" %{
- rmhooks window autowrap
+ remove-hooks window autowrap
}
View
@@ -13,11 +13,11 @@ hook global BufCreate .*[.](cljs?) %{
# Highlighters
# ‾‾‾‾‾‾‾‾‾‾‾‾
-addhl -group / group clojure
+add-highlighter -group / group clojure
-addhl -group /clojure ref lisp
+add-highlighter -group /clojure ref lisp
-addhl -group /clojure regex \b(clojure.core/['/\w]+)\b 0:keyword
+add-highlighter -group /clojure regex \b(clojure.core/['/\w]+)\b 0:keyword
# Commands
# ‾‾‾‾‾‾‾‾
@@ -27,16 +27,16 @@ def -hidden _clojure_indent_on_new_line _lisp_indent_on_new_line
# Initialization
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-hook -group clojure-highlight global WinSetOption filetype=clojure %{ addhl ref clojure }
+hook -group clojure-highlight global WinSetOption filetype=clojure %{ add-highlighter ref clojure }
hook global WinSetOption filetype=clojure %[
hook window InsertEnd .* -group clojure-hooks _clojure_filter_around_selections
hook window InsertChar \n -group clojure-indent _clojure_indent_on_new_line
]
-hook -group clojure-highlight global WinSetOption filetype=(?!clojure).* %{ rmhl clojure }
+hook -group clojure-highlight global WinSetOption filetype=(?!clojure).* %{ remove-highlighter clojure }
hook global WinSetOption filetype=(?!clojure).* %{
- rmhooks window clojure-indent
- rmhooks window clojure-hooks
+ remove-hooks window clojure-indent
+ remove-hooks window clojure-hooks
}
Oops, something went wrong.

0 comments on commit 343df60

Please sign in to comment.