diff options
| author | Ruslan Prokopchuk <fer.obbee@gmail.com> | 2018-10-26 15:29:21 +1100 |
|---|---|---|
| committer | Ruslan Prokopchuk <fer.obbee@gmail.com> | 2018-10-28 08:52:14 +1100 |
| commit | b65a6493aa3465fa1d8a5bfd050591cbbf8f77d7 (patch) | |
| tree | d45b682e0b63b69b226004415dbf6e0669cd2e07 | |
| parent | 3b40ab82f44afcdcda70b1162b5b130fadb22bdc (diff) | |
replace usage of the deprecated 'e' face attribute with the new 'F' one
and update set-face docstring
| -rw-r--r-- | rc/base/javascript.kak | 2 | ||||
| -rw-r--r-- | rc/extra/racer.kak | 14 | ||||
| -rw-r--r-- | src/commands.cc | 4 |
3 files changed, 11 insertions, 9 deletions
diff --git a/rc/base/javascript.kak b/rc/base/javascript.kak index 15b55ddf..4b700a5d 100644 --- a/rc/base/javascript.kak +++ b/rc/base/javascript.kak @@ -83,7 +83,7 @@ define-command -hidden init-javascript-filetype -params 1 %~ add-highlighter "shared/%arg{1}/jsx/tag/base/" regex </?([\w-$]+) 1:keyword add-highlighter "shared/%arg{1}/jsx/tag/base/" regex (</?|/?>) 0:meta - add-highlighter "shared/%arg{1}/jsx/tag/expr/" fill default,default+e + add-highlighter "shared/%arg{1}/jsx/tag/expr/" fill default,default+F add-highlighter "shared/%arg{1}/jsx/tag/expr/" ref %arg{1} # Keywords are collected at diff --git a/rc/extra/racer.kak b/rc/extra/racer.kak index 373f9c4f..2371c597 100644 --- a/rc/extra/racer.kak +++ b/rc/extra/racer.kak @@ -28,14 +28,14 @@ define-command racer-complete -docstring "Complete the current selection with ra sub(/^pub /, "", menu) gsub(/\|/, "\\|", menu) if (type == "Function") { - sub(word, "{default+e}" word "{default+d}", menu) + sub(word, "{default+F}" word "{default+d}", menu) gsub(/^fn /, " fn ", menu) # The extra spaces are there to vertically align # the type of element on the menu to make it easy # to read menu = "{default+d}" menu } else if (type == "Enum") { menu = substr(menu, 0, length(menu) - 2) - sub(word, "{default+e}" word "{default+d}", menu) + sub(word, "{default+F}" word "{default+d}", menu) gsub(/^enum /, " enum ", menu) # The extra spaces are there to vertically align # the type of element on the menu to make it easy # to read @@ -47,24 +47,24 @@ define-command racer-complete -docstring "Complete the current selection with ra menu = substr(menu, length(menu) - 29, 30) # ... trimming it, so the completion menu # doesn''t get distorted if it''s too long } - menu = " mod {default+e}" word "{default+d} .." menu # The extra spaces are there to vertically align + menu = " mod {default+F}" word "{default+d} .." menu # The extra spaces are there to vertically align # the type of element on the menu to make it easy # to read } else if (type == "Trait") { - sub(word, "{default+e}" word "{default+d}", menu) + sub(word, "{default+F}" word "{default+d}", menu) gsub(/^trait /, " trait ", menu) # The extra spaces are there to vertically align # the type of element on the menu to make it easy # to read } else if (type == "Type") { - sub(word, "{default+e}" word "{default+d}", menu) + sub(word, "{default+F}" word "{default+d}", menu) gsub(/^type /, " type ", menu) # The extra spaces are there to vertically align # the type of element on the menu to make it easy # to read } else if (type == "Struct") { - sub(word, "{default+e}" word "{default+d}", menu) # Struct doesn''t have extra spaces because it''s + sub(word, "{default+F}" word "{default+d}", menu) # Struct doesn''t have extra spaces because it''s # the longest keyword } else { - menu = "{default+e}" word "{default+d} " menu + menu = "{default+F}" word "{default+d} " menu } candidate = word "|" desc "|" menu gsub(/:/, "\\:", candidate) diff --git a/src/commands.cc b/src/commands.cc index 6c1ab1b5..50826f1c 100644 --- a/src/commands.cc +++ b/src/commands.cc @@ -2100,7 +2100,9 @@ const CommandDesc set_face_cmd = { "colors are either a color name, or rgb:###### values.\n" "attributes is a combination of:\n" " u: underline, i: italic, b: bold, r: reverse,\n" - " B: blink, d: dim, e: exclusive\n" + " B: blink, d: dim,\n" + " f: final foreground, g: final background,\n" + " a: final attributes, F: same as +fga\n" "facespec can as well just be the name of another face", ParameterDesc{{}, ParameterDesc::Flags::None, 3, 3}, CommandFlags::None, |