From b20c3164217317b1a1b1887cc32c0e1504d982e2 Mon Sep 17 00:00:00 2001
From: Andrey Orst <andreyorst@gmail.com>
Date: Sun, 14 Oct 2018 21:57:44 +0300
Subject: [PATCH] make all mappings use ctrl instead of uppercase letter
 because of https://github.com/junegunn/fzf/issues/1404

---
 rc/fzf.kak | 888 +++++++++++++++++++++++++++--------------------------
 1 file changed, 449 insertions(+), 439 deletions(-)

diff --git a/rc/fzf.kak b/rc/fzf.kak
index 9abb48a..813c2c2 100644
--- a/rc/fzf.kak
+++ b/rc/fzf.kak
@@ -97,7 +97,7 @@ Supported tools:
 
 Default arguments:
     coderay:   ""coderay {}""
-    highlight: ""highlight --failsafe -O ansi -l {}""
+    highlight: ""highlight --failsafe -O ansi {}""
     rouge:     ""rougify {}""
 " \
 str fzf_highlighter "highlight"
@@ -108,9 +108,10 @@ str fzf_tmux_height '25%'
 
 declare-option -docstring "command to provide list of directories to fzf.
 Default value:
-(echo .. && find \( -path '*/.svn*' -o -path '*/.git*' \) -prune -o -type d -print)
+    find: (echo .. && find \( -path '*/.svn*' -o -path '*/.git*' \) -prune -o -type d -print)
 " \
 str fzf_cd_command "find"
+
 # default mappings
 map global fzf -docstring "open buffer"                  'b' '<esc>: fzf-buffer<ret>'
 map global fzf -docstring "change directory"             'c' '<esc>: fzf-cd<ret>'
@@ -416,47 +417,47 @@ define-command -hidden fzf-buffer %{ evaluate-commands %sh{
     ) > /dev/null 2>&1 < /dev/null &
 }}
 
-declare-option -hidden -docstring "Set of mappings for Ada filetype" \
+declare-option -hidden -docstring "A set of mappings for Ada filetype" \
 str fzf_tag_ada "
-<a-P>: package specifications
-<a-p>: packages
-<a-t>: types
-<a-u>: subtypes
-<a-c>: record type components
-<a-l>: enum type literals
-<a-v>: variables
-<a-f>: generic formal parameters
-<a-n>: constants
-<a-x>: user defined exceptions
-<a-R>: subprogram specifications
-<a-r>: subprograms
-<a-K>: task specifications
-<a-k>: tasks
-<a-O>: protected data specifications
-<a-o>: protected data
-<a-e>: task/protected data entries
-<a-b>: labels
-<a-i>: loop/declare identifiers
-<a-S>: (ctags internal use)"
+<c-a-p>: package specifications
+<a-p>:   packages
+<a-t>:   types
+<a-u>:   subtypes
+<a-c>:   record type components
+<a-l>:   enum type literals
+<a-v>:   variables
+<a-f>:   generic formal parameters
+<a-n>:   constants
+<a-x>:   user defined exceptions
+<c-a-r>: subprogram specifications
+<a-r>:   subprograms
+<c-a-k>: task specifications
+<a-k>:   tasks
+<c-a-o>: protected data specifications
+<a-o>:   protected data
+<a-e>:   task/protected data entries
+<a-b>:   labels
+<a-i>:   loop/declare identifiers
+<c-a-s>: (ctags internal use)"
 
-declare-option -hidden -docstring "Set of mappings for Ant filetype" \
+declare-option -hidden -docstring "A set of mappings for Ant filetype" \
 str fzf_tag_ant "
-<a-p>: projects
-<a-t>: targets
-<a-P>: properties(global)
-<a-i>: antfiles"
+<a-p>:   projects
+<a-t>:   targets
+<c-a-p>: properties(global)
+<a-i>:   antfiles"
 
-declare-option -hidden -docstring "Set of mappings for Asciidoc filetype" \
+declare-option -hidden -docstring "A set of mappings for Asciidoc filetype" \
 str fzf_tag_asciidoc "
-<a-c>: chapters
-<a-s>: sections
-<a-S>: level <a-2>: sections
-<a-t>: level <a-3>: sections
-<a-T>: level <a-4>: sections
-<a-u>: level <a-5>: sections
-<a-a>: anchors"
+<a-c>:   chapters
+<a-s>:   sections
+<c-a-s>: level 2 sections
+<a-t>:   level 3 sections
+<c-a-t>: level 4 sections
+<a-u>:   level 5 sections
+<a-a>:   anchors"
 
-declare-option -hidden -docstring "Set of mappings for Asm filetype" \
+declare-option -hidden -docstring "A set of mappings for Asm filetype" \
 str fzf_tag_asm "
 <a-d>: defines
 <a-l>: labels
@@ -464,7 +465,7 @@ str fzf_tag_asm "
 <a-t>: types (structs and records)
 <a-s>: sections"
 
-declare-option -hidden -docstring "Set of mappings for Asp filetype" \
+declare-option -hidden -docstring "A set of mappings for Asp filetype" \
 str fzf_tag_asp "
 <a-d>: constants
 <a-c>: classes
@@ -472,7 +473,7 @@ str fzf_tag_asp "
 <a-s>: subroutines
 <a-v>: variables"
 
-declare-option -hidden -docstring "Set of mappings for Autoconf filetype" \
+declare-option -hidden -docstring "A set of mappings for Autoconf filetype" \
 str fzf_tag_autoconf "
 <a-p>: packages
 <a-t>: templates
@@ -483,30 +484,30 @@ str fzf_tag_autoconf "
 <a-c>: automake conditions
 <a-d>: definitions"
 
-declare-option -hidden -docstring "Set of mappings for AutoIt filetype" \
+declare-option -hidden -docstring "A set of mappings for AutoIt filetype" \
 str fzf_tag_autoit "
-<a-f>: functions
-<a-r>: regions
-<a-g>: global variables
-<a-l>: local variables
-<a-S>: included scripts"
+<a-f>:   functions
+<a-r>:   regions
+<a-g>:   global variables
+<a-l>:   local variables
+<c-a-s>: included scripts"
 
-declare-option -hidden -docstring "Set of mappings for Automake filetype" \
+declare-option -hidden -docstring "A set of mappings for Automake filetype" \
 str fzf_tag_automake "
-<a-d>: directories
-<a-P>: programs
-<a-M>: manuals
-<a-T>: ltlibraries
-<a-L>: libraries
-<a-S>: scripts
-<a-D>: datum
-<a-c>: conditions"
+<a-d>:   directories
+<c-a-p>: programs
+<c-a-m>: manuals
+<c-a-t>: ltlibraries
+<c-a-l>: libraries
+<c-a-s>: scripts
+<c-a-d>: datum
+<a-c>:   conditions"
 
-declare-option -hidden -docstring "Set of mappings for Awk filetype" \
+declare-option -hidden -docstring "A set of mappings for Awk filetype" \
 str fzf_tag_awk "
 <a-f>: functions"
 
-declare-option -hidden -docstring "Set of mappings for Basic filetype" \
+declare-option -hidden -docstring "A set of mappings for Basic filetype" \
 str fzf_tag_basic "
 <a-c>: constants
 <a-f>: functions
@@ -515,28 +516,28 @@ str fzf_tag_basic "
 <a-v>: variables
 <a-g>: enumerations"
 
-declare-option -hidden -docstring "Set of mappings for BETA filetype" \
+declare-option -hidden -docstring "A set of mappings for BETA filetype" \
 str fzf_tag_beta "
 <a-f>: fragment definitions
 <a-s>: slots (fragment uses)
 <a-v>: patterns (virtual or rebound)"
 
-declare-option -hidden -docstring "Set of mappings for Clojure filetype" \
+declare-option -hidden -docstring "A set of mappings for Clojure filetype" \
 str fzf_tag_clojure "
 <a-f>: functions
 <a-n>: namespaces"
 
-declare-option -hidden -docstring "Set of mappings for CMake filetype" \
+declare-option -hidden -docstring "A set of mappings for CMake filetype" \
 str fzf_tag_cmake "
-<a-f>: functions
-<a-m>: macros
-<a-t>: targets
-<a-v>: variable definitions
-<a-D>: options specified with -D
-<a-p>: projects
-<a-r>: regex"
+<a-f>:   functions
+<a-m>:   macros
+<a-t>:   targets
+<a-v>:   variable definitions
+<c-a-d>: options specified with -D
+<a-p>:   projects
+<a-r>:   regex"
 
-declare-option -hidden -docstring "Set of mappings for C filetype" \
+declare-option -hidden -docstring "A set of mappings for C filetype" \
 str fzf_tag_c "
 <a-d>: macro definitions
 <a-e>: enumerators (values inside an enumeration)
@@ -549,7 +550,7 @@ str fzf_tag_c "
 <a-u>: union names
 <a-v>: variable definitions"
 
-declare-option -hidden -docstring "Set of mappings for C++ filetype" \
+declare-option -hidden -docstring "A set of mappings for C++ filetype" \
 str fzf_tag_cpp "
 <a-d>: macro definitions
 <a-e>: enumerators (values inside an enumeration)
@@ -564,49 +565,49 @@ str fzf_tag_cpp "
 <a-c>: classes
 <a-n>: namespaces"
 
-declare-option -hidden -docstring "Set of mappings for CPreProcessor filetype" \
+declare-option -hidden -docstring "A set of mappings for CPreProcessor filetype" \
 str fzf_tag_cpreprocessor "
 <a-d>: macro definitions
 <a-h>: included header files"
 
-declare-option -hidden -docstring "Set of mappings for CSS filetype" \
+declare-option -hidden -docstring "A set of mappings for CSS filetype" \
 str fzf_tag_css "
 <a-c>: classes
 <a-s>: selectors
 <a-i>: identities"
 
-declare-option -hidden -docstring "Set of mappings for C# filetype" \
+declare-option -hidden -docstring "A set of mappings for C# filetype" \
 str fzf_tag_csharp "
-<a-c>: classes
-<a-d>: macro definitions
-<a-e>: enumerators (values inside an enumeration)
-<a-E>: events
-<a-f>: fields
-<a-g>: enumeration names
-<a-i>: interfaces
-<a-m>: methods
-<a-n>: namespaces
-<a-p>: properties
-<a-s>: structure names
-<a-t>: typedefs"
+<a-c>:   classes
+<a-d>:   macro definitions
+<a-e>:   enumerators (values inside an enumeration)
+<c-a-e>: events
+<a-f>:   fields
+<a-g>:   enumeration names
+<a-i>:   interfaces
+<a-m>:   methods
+<a-n>:   namespaces
+<a-p>:   properties
+<a-s>:   structure names
+<a-t>:   typedefs"
 
-declare-option -hidden -docstring "Set of mappings for Ctags filetype" \
+declare-option -hidden -docstring "A set of mappings for Ctags filetype" \
 str fzf_tag_ctags "
 <a-l>: language definitions
 <a-k>: kind definitions"
 
-declare-option -hidden -docstring "Set of mappings for Cobol filetype" \
+declare-option -hidden -docstring "A set of mappings for Cobol filetype" \
 str fzf_tag_cobol "
-<a-p>: paragraphs
-<a-d>: data items
-<a-S>: source code file
-<a-f>: file descriptions (FD, SD, RD)
-<a-g>: group items
-<a-P>: program ids
-<a-s>: sections
-<a-D>: divisions"
+<a-p>:   paragraphs
+<a-d>:   data items
+<c-a-s>: source code file
+<a-f>:   file descriptions (FD, SD, RD)
+<a-g>:   group items
+<c-a-p>: program ids
+<a-s>:   sections
+<c-a-d>: divisions"
 
-declare-option -hidden -docstring "Set of mappings for CUDA filetype" \
+declare-option -hidden -docstring "A set of mappings for CUDA filetype" \
 str fzf_tag_cuda "
 <a-d>: macro definitions
 <a-e>: enumerators (values inside an enumeration)
@@ -619,56 +620,56 @@ str fzf_tag_cuda "
 <a-u>: union names
 <a-v>: variable definitions"
 
-declare-option -hidden -docstring "Set of mappings for D filetype" \
+declare-option -hidden -docstring "A set of mappings for D filetype" \
 str fzf_tag_d "
-<a-a>: aliases
-<a-c>: classes
-<a-g>: enumeration names
-<a-e>: enumerators (values inside an enumeration)
-<a-f>: function definitions
-<a-i>: interfaces
-<a-m>: class, struct, and union members
-<a-X>: mixins
-<a-M>: modules
-<a-n>: namespaces
-<a-s>: structure names
-<a-T>: templates
-<a-u>: union names
-<a-v>: variable definitions
-<a-V>: version statements"
+<a-a>:   aliases
+<a-c>:   classes
+<a-g>:   enumeration names
+<a-e>:   enumerators (values inside an enumeration)
+<a-f>:   function definitions
+<a-i>:   interfaces
+<a-m>:   class, struct, and union members
+<c-a-x>: mixins
+<c-a-m>: modules
+<a-n>:   namespaces
+<a-s>:   structure names
+<c-a-t>: templates
+<a-u>:   union names
+<a-v>:   variable definitions
+<c-a-v>: version statements"
 
-declare-option -hidden -docstring "Set of mappings for Diff filetype" \
+declare-option -hidden -docstring "A set of mappings for Diff filetype" \
 str fzf_tag_diff "
 <a-m>: modified files
 <a-n>: newly created files
 <a-d>: deleted files
 <a-h>: hunks"
 
-declare-option -hidden -docstring "Set of mappings for DTD filetype" \
+declare-option -hidden -docstring "A set of mappings for DTD filetype" \
 str fzf_tag_dtd "
-<a-E>: entities
-<a-p>: parameter entities
-<a-e>: elements
-<a-a>: attributes
-<a-n>: notations"
+<c-a-e>: entities
+<a-p>:   parameter entities
+<a-e>:   elements
+<a-a>:   attributes
+<a-n>:   notations"
 
-declare-option -hidden -docstring "Set of mappings for DTS filetype" \
+declare-option -hidden -docstring "A set of mappings for DTS filetype" \
 str fzf_tag_dts "
 <a-p>: phandlers
 <a-l>: labels
 <a-r>: regex"
 
-declare-option -hidden -docstring "Set of mappings for DosBatch filetype" \
+declare-option -hidden -docstring "A set of mappings for DosBatch filetype" \
 str fzf_tag_dosbatch "
 <a-l>: labels
 <a-v>: variables"
 
-declare-option -hidden -docstring "Set of mappings for Eiffel filetype" \
+declare-option -hidden -docstring "A set of mappings for Eiffel filetype" \
 str fzf_tag_eiffel "
 <a-c>: classes
 <a-f>: features"
 
-declare-option -hidden -docstring "Set of mappings for Elm filetype" \
+declare-option -hidden -docstring "A set of mappings for Elm filetype" \
 str fzf_tag_elm "
 <a-m>: Module
 <a-n>: Renamed Imported Module
@@ -678,7 +679,7 @@ str fzf_tag_elm "
 <a-a>: Type Alias
 <a-f>: Functions"
 
-declare-option -hidden -docstring "Set of mappings for Erlang filetype" \
+declare-option -hidden -docstring "A set of mappings for Erlang filetype" \
 str fzf_tag_erlang "
 <a-d>: macro definitions
 <a-f>: functions
@@ -686,7 +687,7 @@ str fzf_tag_erlang "
 <a-r>: record definitions
 <a-t>: type definitions"
 
-declare-option -hidden -docstring "Set of mappings for Falcon filetype" \
+declare-option -hidden -docstring "A set of mappings for Falcon filetype" \
 str fzf_tag_falcon "
 <a-c>: classes
 <a-f>: functions
@@ -694,7 +695,7 @@ str fzf_tag_falcon "
 <a-v>: variables
 <a-i>: imports"
 
-declare-option -hidden -docstring "Set of mappings for Flex filetype" \
+declare-option -hidden -docstring "A set of mappings for Flex filetype" \
 str fzf_tag_flex "
 <a-f>: functions
 <a-c>: classes
@@ -703,70 +704,70 @@ str fzf_tag_flex "
 <a-v>: global variables
 <a-x>: mxtags"
 
-declare-option -hidden -docstring "Set of mappings for Fortran filetype" \
+declare-option -hidden -docstring "A set of mappings for Fortran filetype" \
 str fzf_tag_fortran "
-<a-b>: block data
-<a-c>: common blocks
-<a-e>: entry points
-<a-E>: enumerations
-<a-f>: functions
-<a-i>: interface contents, generic names, and operators
-<a-k>: type and structure components
-<a-l>: labels
-<a-m>: modules
-<a-M>: type bound procedures
-<a-n>: namelists
-<a-N>: enumeration values
-<a-p>: programs
-<a-s>: subroutines
-<a-t>: derived types and structures
-<a-v>: program (global) and module variables
-<a-S>: submodules"
+<a-b>:   block data
+<a-c>:   common blocks
+<a-e>:   entry points
+<c-a-e>: enumerations
+<a-f>:   functions
+<a-i>:   interface contents, generic names, and operators
+<a-k>:   type and structure components
+<a-l>:   labels
+<a-m>:   modules
+<c-a-m>: type bound procedures
+<a-n>:   namelists
+<c-a-n>: enumeration values
+<a-p>:   programs
+<a-s>:   subroutines
+<a-t>:   derived types and structures
+<a-v>:   program (global) and module variables
+<c-a-s>: submodules"
 
-declare-option -hidden -docstring "Set of mappings for Fypp filetype" \
+declare-option -hidden -docstring "A set of mappings for Fypp filetype" \
 str fzf_tag_fypp "
 <a-m>: macros"
 
-declare-option -hidden -docstring "Set of mappings for Gdbinit filetype" \
+declare-option -hidden -docstring "A set of mappings for Gdbinit filetype" \
 str fzf_tag_gdbinit "
 <a-d>: definitions
 <a-t>: toplevel variables"
 
-declare-option -hidden -docstring "Set of mappings for Go filetype" \
+declare-option -hidden -docstring "A set of mappings for Go filetype" \
 str fzf_tag_go "
-<a-p>: packages
-<a-f>: functions
-<a-c>: constants
-<a-t>: types
-<a-v>: variables
-<a-s>: structs
-<a-i>: interfaces
-<a-m>: struct members
-<a-M>: struct anonymous members
-<a-u>: unknown
-<a-P>: name for specifying imported package"
+<a-p>:   packages
+<a-f>:   functions
+<a-c>:   constants
+<a-t>:   types
+<a-v>:   variables
+<a-s>:   structs
+<a-i>:   interfaces
+<a-m>:   struct members
+<c-a-m>: struct anonymous members
+<a-u>:   unknown
+<c-a-p>: name for specifying imported package"
 
-declare-option -hidden -docstring "Set of mappings for HTML filetype" \
+declare-option -hidden -docstring "A set of mappings for HTML filetype" \
 str fzf_tag_html "
 <a-a>: named anchors
 <a-h>: H1 headings
 <a-i>: H2 headings
 <a-j>: H3 headings"
 
-declare-option -hidden -docstring "Set of mappings for Iniconf filetype" \
+declare-option -hidden -docstring "A set of mappings for Iniconf filetype" \
 str fzf_tag_iniconf "
 <a-s>: sections
 <a-k>: keys"
 
-declare-option -hidden -docstring "Set of mappings for ITcl filetype" \
+declare-option -hidden -docstring "A set of mappings for ITcl filetype" \
 str fzf_tag_itcl "
-<a-c>: classes
-<a-m>: methods
-<a-v>: object-specific variables
-<a-C>: common variables
-<a-p>: procedures within the  class  namespace"
+<a-c>:   classes
+<a-m>:   methods
+<a-v>:   object-specific variables
+<c-a-c>: common variables
+<a-p>:   procedures within the  class  namespace"
 
-declare-option -hidden -docstring "Set of mappings for Java filetype" \
+declare-option -hidden -docstring "A set of mappings for Java filetype" \
 str fzf_tag_java "
 <a-a>: annotation declarations
 <a-c>: classes
@@ -777,21 +778,21 @@ str fzf_tag_java "
 <a-m>: methods
 <a-p>: packages"
 
-declare-option -hidden -docstring "Set of mappings for JavaProperties filetype" \
+declare-option -hidden -docstring "A set of mappings for JavaProperties filetype" \
 str fzf_tag_javaproperties "
 <a-k>: keys"
 
-declare-option -hidden -docstring "Set of mappings for JavaScript filetype" \
+declare-option -hidden -docstring "A set of mappings for JavaScript filetype" \
 str fzf_tag_javascript "
-<a-f>: functions
-<a-c>: classes
-<a-m>: methods
-<a-p>: properties
-<a-C>: constants
-<a-v>: global variables
-<a-g>: generators"
+<a-f>:   functions
+<a-c>:   classes
+<a-m>:   methods
+<a-p>:   properties
+<c-a-c>: constants
+<a-v>:   global variables
+<a-g>:   generators"
 
-declare-option -hidden -docstring "Set of mappings for JSON filetype" \
+declare-option -hidden -docstring "A set of mappings for JSON filetype" \
 str fzf_tag_json "
 <a-o>: objects
 <a-a>: arrays
@@ -800,54 +801,54 @@ str fzf_tag_json "
 <a-b>: booleans
 <a-z>: nulls"
 
-declare-option -hidden -docstring "Set of mappings for LdScript filetype" \
+declare-option -hidden -docstring "A set of mappings for LdScript filetype" \
 str fzf_tag_ldscript "
-<a-S>: sections
-<a-s>: symbols
-<a-v>: versions
-<a-i>: input sections"
+<c-a-s>: sections
+<a-s>:   symbols
+<a-v>:   versions
+<a-i>:   input sections"
 
-declare-option -hidden -docstring "Set of mappings for Lisp filetype" \
+declare-option -hidden -docstring "A set of mappings for Lisp filetype" \
 str fzf_tag_lisp "
 <a-f>: functions"
 
-declare-option -hidden -docstring "Set of mappings for Lua filetype" \
+declare-option -hidden -docstring "A set of mappings for Lua filetype" \
 str fzf_tag_lua "
 <a-f>: functions"
 
-declare-option -hidden -docstring "Set of mappings for M4 filetype" \
+declare-option -hidden -docstring "A set of mappings for M4 filetype" \
 str fzf_tag_m4 "
-<a-d>: macros
-<a-I>: macro files"
+<a-d>:   macros
+<c-a-i>: macro files"
 
-declare-option -hidden -docstring "Set of mappings for Man filetype" \
+declare-option -hidden -docstring "A set of mappings for Man filetype" \
 str fzf_tag_man "
 <a-t>: titles
 <a-s>: sections"
 
-declare-option -hidden -docstring "Set of mappings for Make filetype" \
+declare-option -hidden -docstring "A set of mappings for Make filetype" \
 str fzf_tag_make "
-<a-m>: macros
-<a-t>: targets
-<a-I>: makefiles"
+<a-m>:   macros
+<a-t>:   targets
+<c-a-i>: makefiles"
 
-declare-option -hidden -docstring "Set of mappings for Markdown filetype" \
+declare-option -hidden -docstring "A set of mappings for Markdown filetype" \
 str fzf_tag_markdown "
-<a-c>: chapsters
-<a-s>: sections
-<a-S>: subsections
-<a-t>: subsubsections
-<a-T>: level <a-4>: subsections
-<a-u>: level <a-5>: subsections
-<a-r>: regex"
+<a-c>:   chapsters
+<a-s>:   sections
+<c-a-s>: subsections
+<a-t>:   subsubsections
+<c-a-t>: level 4 subsections
+<a-u>:   level 5 subsections
+<a-r>:   regex"
 
-declare-option -hidden -docstring "Set of mappings for MatLab filetype" \
+declare-option -hidden -docstring "A set of mappings for MatLab filetype" \
 str fzf_tag_matlab "
 <a-f>: function
 <a-v>: variable
 <a-c>: class"
 
-declare-option -hidden -docstring "Set of mappings for Myrddin filetype" \
+declare-option -hidden -docstring "A set of mappings for Myrddin filetype" \
 str fzf_tag_myrddin "
 <a-f>: functions
 <a-c>: constants
@@ -856,45 +857,45 @@ str fzf_tag_myrddin "
 <a-r>: traits
 <a-p>: packages"
 
-declare-option -hidden -docstring "Set of mappings for ObjectiveC filetype" \
+declare-option -hidden -docstring "A set of mappings for ObjectiveC filetype" \
 str fzf_tag_objectivec "
-<a-i>: class interface
-<a-I>: class implementation
-<a-P>: Protocol
-<a-m>: Object's method
-<a-c>: Class' method
-<a-v>: Global variable
-<a-E>: Object field
-<a-f>: <a-A>: function
-<a-p>: <a-A>: property
-<a-t>: <a-A>: type alias
-<a-s>: <a-A>: type structure
-<a-e>: An enumeration
-<a-M>: <a-A>: preprocessor macro"
+<a-i>:   class interface
+<c-a-i>: class implementation
+<c-a-p>: Protocol
+<a-m>:   Object's method
+<a-c>:   Class' method
+<a-v>:   Global variable
+<c-a-e>: Object field
+<a-f>:   A function
+<a-p>:   A property
+<a-t>:   A type alias
+<a-s>:   A type structure
+<a-e>:   An enumeration
+<c-a-m>: A preprocessor macro"
 
-declare-option -hidden -docstring "Set of mappings for OCaml filetype" \
+declare-option -hidden -docstring "A set of mappings for OCaml filetype" \
 str fzf_tag_ocaml "
-<a-c>: classes
-<a-m>: Object's method
-<a-M>: Module or functor
-<a-v>: Global variable
-<a-p>: Signature item
-<a-t>: Type name
-<a-f>: <a-A>: function
-<a-C>: <a-A>: constructor
-<a-r>: <a-A>: 'structure' field
-<a-e>: An exception"
+<a-c>:   classes
+<a-m>:   Object's method
+<c-a-m>: Module or functor
+<a-v>:   Global variable
+<a-p>:   Signature item
+<a-t>:   Type name
+<a-f>:   A function
+<c-a-c>: A constructor
+<a-r>:   A 'structure' field
+<a-e>:   An exception"
 
-declare-option -hidden -docstring "Set of mappings for Passwd filetype" \
+declare-option -hidden -docstring "A set of mappings for Passwd filetype" \
 str fzf_tag_passwd "
 <a-u>: user names"
 
-declare-option -hidden -docstring "Set of mappings for Pascal filetype" \
+declare-option -hidden -docstring "A set of mappings for Pascal filetype" \
 str fzf_tag_pascal "
 <a-f>: functions
 <a-p>: procedures"
 
-declare-option -hidden -docstring "Set of mappings for Perl filetype" \
+declare-option -hidden -docstring "A set of mappings for Perl filetype" \
 str fzf_tag_perl "
 <a-c>: constants
 <a-f>: formats
@@ -902,7 +903,7 @@ str fzf_tag_perl "
 <a-p>: packages
 <a-s>: subroutines"
 
-declare-option -hidden -docstring "Set of mappings for Perl6 filetype" \
+declare-option -hidden -docstring "A set of mappings for Perl6 filetype" \
 str fzf_tag_perl6 "
 <a-c>: classes
 <a-g>: grammars
@@ -915,7 +916,7 @@ str fzf_tag_perl6 "
 <a-s>: subroutines
 <a-t>: tokens"
 
-declare-option -hidden -docstring "Set of mappings for PHP filetype" \
+declare-option -hidden -docstring "A set of mappings for PHP filetype" \
 str fzf_tag_php "
 <a-c>: classes
 <a-d>: constant definitions
@@ -926,14 +927,14 @@ str fzf_tag_php "
 <a-v>: variables
 <a-a>: aliases"
 
-declare-option -hidden -docstring "Set of mappings for Pod filetype" \
+declare-option -hidden -docstring "A set of mappings for Pod filetype" \
 str fzf_tag_pod "
-<a-c>: chapters
-<a-s>: sections
-<a-S>: subsections
-<a-t>: subsubsections"
+<a-c>:   chapters
+<a-s>:   sections
+<c-a-s>: subsections
+<a-t>:   subsubsections"
 
-declare-option -hidden -docstring "Set of mappings for Protobuf filetype" \
+declare-option -hidden -docstring "A set of mappings for Protobuf filetype" \
 str fzf_tag_protobuf "
 <a-p>: packages
 <a-m>: messages
@@ -942,7 +943,7 @@ str fzf_tag_protobuf "
 <a-g>: enum types
 <a-s>: services"
 
-declare-option -hidden -docstring "Set of mappings for PuppetManifest filetype" \
+declare-option -hidden -docstring "A set of mappings for PuppetManifest filetype" \
 str fzf_tag_puppetmanifest "
 <a-c>: classes
 <a-d>: definitions
@@ -950,33 +951,33 @@ str fzf_tag_puppetmanifest "
 <a-r>: resources
 <a-v>: variables"
 
-declare-option -hidden -docstring "Set of mappings for Python filetype" \
+declare-option -hidden -docstring "A set of mappings for Python filetype" \
 str fzf_tag_python "
-<a-c>: classes
-<a-f>: functions
-<a-m>: class members
-<a-v>: variables
-<a-I>: name referring <a-a>: module defined in other file
-<a-i>: modules
-<a-x>: name referring <a-a>: class/variable/function/module defined in other module"
+<a-c>:   classes
+<a-f>:   functions
+<a-m>:   class members
+<a-v>:   variables
+<c-a-i>: name referring a module defined in other file
+<a-i>:   modules
+<a-x>:   name referring a class/variable/function/module defined in other module"
 
-declare-option -hidden -docstring "Set of mappings for PythonLoggingConfig filetype" \
+declare-option -hidden -docstring "A set of mappings for PythonLoggingConfig filetype" \
 str fzf_tag_pythonloggingconfig "
-<a-L>: logger sections
-<a-q>: logger qualnames"
+<c-a-l>: logger sections
+<a-q>:   logger qualnames"
 
-declare-option -hidden -docstring "Set of mappings for QemuHX filetype" \
+declare-option -hidden -docstring "A set of mappings for QemuHX filetype" \
 str fzf_tag_qemuhx "
 <a-q>: QEMU Management Protocol dispatch table entries
 <a-i>: item in texinfo doc"
 
-declare-option -hidden -docstring "Set of mappings for QtMoc filetype" \
+declare-option -hidden -docstring "A set of mappings for QtMoc filetype" \
 str fzf_tag_qtmoc "
-<a-s>: slots
-<a-S>: signals
-<a-p>: properties"
+<a-s>:   slots
+<c-a-s>: signals
+<a-p>:   properties"
 
-declare-option -hidden -docstring "Set of mappings for R filetype" \
+declare-option -hidden -docstring "A set of mappings for R filetype" \
 str fzf_tag_r "
 <a-f>: functions
 <a-l>: libraries
@@ -984,76 +985,76 @@ str fzf_tag_r "
 <a-g>: global variables
 <a-v>: function variables"
 
-declare-option -hidden -docstring "Set of mappings for RSpec filetype" \
+declare-option -hidden -docstring "A set of mappings for RSpec filetype" \
 str fzf_tag_rspec "
 <a-d>: describes
 <a-c>: contexts"
 
-declare-option -hidden -docstring "Set of mappings for REXX filetype" \
+declare-option -hidden -docstring "A set of mappings for REXX filetype" \
 str fzf_tag_rexx "
 <a-s>: subroutines"
 
-declare-option -hidden -docstring "Set of mappings for Robot filetype" \
+declare-option -hidden -docstring "A set of mappings for Robot filetype" \
 str fzf_tag_robot "
 <a-t>: testcases
 <a-k>: keywords
 <a-v>: variables"
 
-declare-option -hidden -docstring "Set of mappings for RpmSpec filetype" \
+declare-option -hidden -docstring "A set of mappings for RpmSpec filetype" \
 str fzf_tag_rpmspec "
 <a-t>: tags
 <a-m>: macros
 <a-p>: packages
 <a-g>: global macros"
 
-declare-option -hidden -docstring "Set of mappings for ReStructuredText filetype" \
+declare-option -hidden -docstring "A set of mappings for ReStructuredText filetype" \
 str fzf_tag_restructuredtext "
-<a-c>: chapters
-<a-s>: sections
-<a-S>: subsections
-<a-t>: subsubsections
-<a-T>: targets"
+<a-c>:   chapters
+<a-s>:   sections
+<c-a-s>: subsections
+<a-t>:   subsubsections
+<c-a-t>: targets"
 
-declare-option -hidden -docstring "Set of mappings for Ruby filetype" \
+declare-option -hidden -docstring "A set of mappings for Ruby filetype" \
 str fzf_tag_ruby "
-<a-c>: classes
-<a-f>: methods
-<a-m>: modules
-<a-S>: singleton methods"
+<a-c>:   classes
+<a-f>:   methods
+<a-m>:   modules
+<c-a-s>: singleton methods"
 
-declare-option -hidden -docstring "Set of mappings for Rust filetype" \
+declare-option -hidden -docstring "A set of mappings for Rust filetype" \
 str fzf_tag_rust "
-<a-n>: module
-<a-s>: structural type
-<a-i>: trait interface
-<a-c>: implementation
-<a-f>: Function
-<a-g>: Enum
-<a-t>: Type Alias
-<a-v>: Global variable
-<a-M>: Macro Definition
-<a-m>: <a-A>: struct field
-<a-e>: An enum variant
-<a-P>: <a-A>: method"
+<a-n>:   module
+<a-s>:   structural type
+<a-i>:   trait interface
+<a-c>:   implementation
+<a-f>:   Function
+<a-g>:   Enum
+<a-t>:   Type Alias
+<a-v>:   Global variable
+<c-a-m>: Macro Definition
+<a-m>:   A struct field
+<a-e>:   An enum variant
+<c-a-p>: A method"
 
-declare-option -hidden -docstring "Set of mappings for Scheme filetype" \
+declare-option -hidden -docstring "A set of mappings for Scheme filetype" \
 str fzf_tag_scheme "
 <a-f>: functions
 <a-s>: sets"
 
-declare-option -hidden -docstring "Set of mappings for Sh filetype" \
+declare-option -hidden -docstring "A set of mappings for Sh filetype" \
 str fzf_tag_sh "
 <a-a>: aliases
 <a-f>: functions
 <a-s>: script files
 <a-h>: label for here document"
 
-declare-option -hidden -docstring "Set of mappings for SLang filetype" \
+declare-option -hidden -docstring "A set of mappings for SLang filetype" \
 str fzf_tag_slang "
 <a-f>: functions
 <a-n>: namespaces"
 
-declare-option -hidden -docstring "Set of mappings for SML filetype" \
+declare-option -hidden -docstring "A set of mappings for SML filetype" \
 str fzf_tag_sml "
 <a-e>: exception declarations
 <a-f>: function definitions
@@ -1063,90 +1064,90 @@ str fzf_tag_sml "
 <a-t>: type definitions
 <a-v>: value bindings"
 
-declare-option -hidden -docstring "Set of mappings for SQL filetype" \
+declare-option -hidden -docstring "A set of mappings for SQL filetype" \
 str fzf_tag_sql "
-<a-c>: cursors
-<a-f>: functions
-<a-E>: record fields
-<a-L>: block label
-<a-P>: packages
-<a-p>: procedures
-<a-s>: subtypes
-<a-t>: tables
-<a-T>: triggers
-<a-v>: variables
-<a-i>: indexes
-<a-e>: events
-<a-U>: publications
-<a-R>: services
-<a-D>: domains
-<a-V>: views
-<a-n>: synonyms
-<a-x>: MobiLink Table Scripts
-<a-y>: MobiLink Conn Scripts
-<a-z>: MobiLink Properties "
+<a-c>:   cursors
+<a-f>:   functions
+<c-a-e>: record fields
+<c-a-l>: block label
+<c-a-p>: packages
+<a-p>:   procedures
+<a-s>:   subtypes
+<a-t>:   tables
+<c-a-t>: triggers
+<a-v>:   variables
+<a-i>:   indexes
+<a-e>:   events
+<c-a-u>: publications
+<c-a-r>: services
+<c-a-d>: domains
+<c-a-v>: views
+<a-n>:   synonyms
+<a-x>:   MobiLink Table Scripts
+<a-y>:   MobiLink Conn Scripts
+<a-z>:   MobiLink Properties "
 
-declare-option -hidden -docstring "Set of mappings for SystemdUnit filetype" \
+declare-option -hidden -docstring "A set of mappings for SystemdUnit filetype" \
 str fzf_tag_systemdunit "
 <a-u>: units"
 
-declare-option -hidden -docstring "Set of mappings for Tcl filetype" \
+declare-option -hidden -docstring "A set of mappings for Tcl filetype" \
 str fzf_tag_tcl "
 <a-p>: procedures
 <a-n>: namespaces"
 
-declare-option -hidden -docstring "Set of mappings for TclOO filetype" \
+declare-option -hidden -docstring "A set of mappings for TclOO filetype" \
 str fzf_tag_tcloo "
 <a-c>: classes
 <a-m>: methods"
 
-declare-option -hidden -docstring "Set of mappings for Tex filetype" \
+declare-option -hidden -docstring "A set of mappings for Tex filetype" \
 str fzf_tag_tex "
-<a-p>: parts
-<a-c>: chapters
-<a-s>: sections
-<a-u>: subsections
-<a-b>: subsubsections
-<a-P>: paragraphs
-<a-G>: subparagraphs
-<a-l>: labels
-<a-i>: includes"
+<a-p>:   parts
+<a-c>:   chapters
+<a-s>:   sections
+<a-u>:   subsections
+<a-b>:   subsubsections
+<c-a-p>: paragraphs
+<c-a-g>: subparagraphs
+<a-l>:   labels
+<a-i>:   includes"
 
-declare-option -hidden -docstring "Set of mappings for TTCN filetype" \
+declare-option -hidden -docstring "A set of mappings for TTCN filetype" \
 str fzf_tag_ttcn "
-<a-M>: module definition
-<a-t>: type definition
-<a-c>: constant definition
-<a-d>: template definition
-<a-f>: function definition
-<a-s>: signature definition
-<a-C>: testcase definition
-<a-a>: altstep definition
-<a-G>: group definition
-<a-P>: module parameter definition
-<a-v>: variable instance
-<a-T>: timer instance
-<a-p>: port instance
-<a-m>: record/set/union member
-<a-e>: enumeration value"
+<c-a-m>: module definition
+<a-t>:   type definition
+<a-c>:   constant definition
+<a-d>:   template definition
+<a-f>:   function definition
+<a-s>:   signature definition
+<c-a-c>: testcase definition
+<a-a>:   altstep definition
+<c-a-g>: group definition
+<c-a-p>: module parameter definition
+<a-v>:   variable instance
+<c-a-t>: timer instance
+<a-p>:   port instance
+<a-m>:   record/set/union member
+<a-e>:   enumeration value"
 
-declare-option -hidden -docstring "Set of mappings for Vera filetype" \
+declare-option -hidden -docstring "A set of mappings for Vera filetype" \
 str fzf_tag_vera "
-<a-c>: classes
-<a-d>: macro definitions
-<a-e>: enumerators (values inside an enumeration)
-<a-f>: function definitions
-<a-g>: enumeration names
-<a-i>: interfaces
-<a-m>: class, struct, and union members
-<a-p>: programs
-<a-s>: signals
-<a-t>: tasks
-<a-T>: typedefs
-<a-v>: variable definitions
-<a-h>: included header files"
+<a-c>:   classes
+<a-d>:   macro definitions
+<a-e>:   enumerators (values inside an enumeration)
+<a-f>:   function definitions
+<a-g>:   enumeration names
+<a-i>:   interfaces
+<a-m>:   class, struct, and union members
+<a-p>:   programs
+<a-s>:   signals
+<a-t>:   tasks
+<c-a-t>: typedefs
+<a-v>:   variable definitions
+<a-h>:   included header files"
 
-declare-option -hidden -docstring "Set of mappings for Verilog filetype" \
+declare-option -hidden -docstring "A set of mappings for Verilog filetype" \
 str fzf_tag_verilog "
 <a-c>: constants (define, parameter, specparam)
 <a-e>: events
@@ -1158,41 +1159,41 @@ str fzf_tag_verilog "
 <a-t>: tasks
 <a-b>: blocks"
 
-declare-option -hidden -docstring "Set of mappings for SystemVerilog filetype" \
+declare-option -hidden -docstring "A set of mappings for SystemVerilog filetype" \
 str fzf_tag_systemverilog "
-<a-c>: constants (define, parameter, specparam, enum values)
-<a-e>: events
-<a-f>: functions
-<a-m>: modules
-<a-n>: net data types
-<a-p>: ports
-<a-r>: register data types
-<a-t>: tasks
-<a-b>: blocks
-<a-A>: assertions
-<a-C>: classes
-<a-V>: covergroups
-<a-E>: enumerators
-<a-I>: interfaces
-<a-M>: modports
-<a-K>: packages
-<a-P>: programs
-<a-R>: properties
-<a-S>: structs and unions
-<a-T>: type declarations"
+<a-c>:   constants (define, parameter, specparam, enum values)
+<a-e>:   events
+<a-f>:   functions
+<a-m>:   modules
+<a-n>:   net data types
+<a-p>:   ports
+<a-r>:   register data types
+<a-t>:   tasks
+<a-b>:   blocks
+<c-a-a>: assertions
+<c-a-c>: classes
+<c-a-v>: covergroups
+<c-a-e>: enumerators
+<c-a-i>: interfaces
+<c-a-m>: modports
+<c-a-k>: packages
+<c-a-p>: programs
+<c-a-r>: properties
+<c-a-s>: structs and unions
+<c-a-t>: type declarations"
 
-declare-option -hidden -docstring "Set of mappings for VHDL filetype" \
+declare-option -hidden -docstring "A set of mappings for VHDL filetype" \
 str fzf_tag_vhdl "
-<a-c>: constant declarations
-<a-t>: type definitions
-<a-T>: subtype definitions
-<a-r>: record names
-<a-e>: entity declarations
-<a-f>: function prototypes and declarations
-<a-p>: procedure prototypes and declarations
-<a-P>: package definitions"
+<a-c>:   constant declarations
+<a-t>:   type definitions
+<c-a-t>: subtype definitions
+<a-r>:   record names
+<a-e>:   entity declarations
+<a-f>:   function prototypes and declarations
+<a-p>:   procedure prototypes and declarations
+<c-a-p>: package definitions"
 
-declare-option -hidden -docstring "Set of mappings for Vim filetype" \
+declare-option -hidden -docstring "A set of mappings for Vim filetype" \
 str fzf_tag_vim "
 <a-a>: autocommand groups
 <a-c>: user-defined commands
@@ -1201,7 +1202,7 @@ str fzf_tag_vim "
 <a-v>: variable definitions
 <a-n>: vimball filename"
 
-declare-option -hidden -docstring "Set of mappings for WindRes filetype" \
+declare-option -hidden -docstring "A set of mappings for WindRes filetype" \
 str fzf_tag_windres "
 <a-d>: dialogs
 <a-m>: menus
@@ -1212,15 +1213,15 @@ str fzf_tag_windres "
 <a-v>: versions
 <a-a>: accelerators"
 
-declare-option -hidden -docstring "Set of mappings for YACC filetype" \
+declare-option -hidden -docstring "A set of mappings for YACC filetype" \
 str fzf_tag_yacc "
 <a-l>: labels"
 
-declare-option -hidden -docstring "Set of mappings for YumRepo filetype" \
+declare-option -hidden -docstring "A set of mappings for YumRepo filetype" \
 str fzf_tag_yumrepo "
 <a-r>: repository id"
 
-declare-option -hidden -docstring "Set of mappings for Zephir filetype" \
+declare-option -hidden -docstring "A set of mappings for Zephir filetype" \
 str fzf_tag_zephir "
 <a-c>: classes
 <a-d>: constant definitions
@@ -1231,41 +1232,41 @@ str fzf_tag_zephir "
 <a-v>: variables
 <a-a>: aliases"
 
-declare-option -hidden -docstring "Set of mappings for DBusIntrospect filetype" \
+declare-option -hidden -docstring "A set of mappings for DBusIntrospect filetype" \
 str fzf_tag_dbusintrospect "
 <a-i>: interfaces
 <a-m>: methods
 <a-s>: signals
 <a-p>: properties"
 
-declare-option -hidden -docstring "Set of mappings for Glade filetype" \
+declare-option -hidden -docstring "A set of mappings for Glade filetype" \
 str fzf_tag_glade "
 <a-i>: identifiers
 <a-c>: classes
 <a-h>: handlers"
 
-declare-option -hidden -docstring "Set of mappings for Maven2 filetype" \
+declare-option -hidden -docstring "A set of mappings for Maven2 filetype" \
 str fzf_tag_maven2 "
 <a-g>: group identifiers
 <a-a>: artifact identifiers
 <a-p>: properties
 <a-r>: repository identifiers"
 
-declare-option -hidden -docstring "Set of mappings for PlistXML filetype" \
+declare-option -hidden -docstring "A set of mappings for PlistXML filetype" \
 str fzf_tag_plistxml "
 <a-k>: keys"
 
-declare-option -hidden -docstring "Set of mappings for RelaxNG filetype" \
+declare-option -hidden -docstring "A set of mappings for RelaxNG filetype" \
 str fzf_tag_relaxng "
 <a-e>: elements
 <a-a>: attributes
 <a-n>: named patterns"
 
-declare-option -hidden -docstring "Set of mappings for SVG filetype" \
+declare-option -hidden -docstring "A set of mappings for SVG filetype" \
 str fzf_tag_svg "
 <a-i>: id attributes"
 
-declare-option -hidden -docstring "Set of mappings for XSLT filetype" \
+declare-option -hidden -docstring "A set of mappings for XSLT filetype" \
 str fzf_tag_xslt "
 <a-s>: stylesheets
 <a-p>: parameters
@@ -1273,24 +1274,24 @@ str fzf_tag_xslt "
 <a-n>: matched template
 <a-v>: variables"
 
-declare-option -hidden -docstring "Set of mappings for Yaml filetype" \
+declare-option -hidden -docstring "A set of mappings for Yaml filetype" \
 str fzf_tag_yaml "
 <a-a>: anchors"
 
-declare-option -hidden -docstring "Set of mappings for AnsiblePlaybook filetype" \
+declare-option -hidden -docstring "A set of mappings for AnsiblePlaybook filetype" \
 str fzf_tag_ansibleplaybook "
 <a-p>: plays"
 
 define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
     case $kak_opt_filetype in
         ada)
-            additional_keybindings="--expect alt-P --expect alt-p --expect alt-T --expect alt-t --expect alt-U --expect alt-u --expect alt-c --expect alt-l --expect alt-V --expect alt-v --expect alt-f --expect alt-n --expect alt-x --expect alt-R --expect alt-r --expect alt-K --expect alt-k --expect alt-O --expect alt-o --expect alt-E --expect alt-e --expect alt-b --expect alt-i --expect alt-a --expect alt-y --expect alt-S"
+            additional_keybindings="--expect ctrl-alt-p --expect alt-p --expect ctrl-alt-t --expect alt-t --expect ctrl-alt-u --expect alt-u --expect alt-c --expect alt-l --expect ctrl-alt-v --expect alt-v --expect alt-f --expect alt-n --expect alt-x --expect ctrl-alt-r --expect alt-r --expect ctrl-alt-k --expect alt-k --expect ctrl-alt-o --expect alt-o --expect ctrl-alt-e --expect alt-e --expect alt-b --expect alt-i --expect alt-a --expect alt-y --expect ctrl-alt-s"
             additional_message=$kak_opt_fzf_tag_ada ;;
         ant)
-            additional_keybindings="--expect alt-p --expect alt-t --expect alt-P --expect alt-i"
+            additional_keybindings="--expect alt-p --expect alt-t --expect ctrl-alt-p --expect alt-i"
             additional_message=$kak_opt_fzf_tag_ant ;;
         asciidoc)
-            additional_keybindings="--expect alt-c --expect alt-s --expect alt-S --expect alt-t --expect alt-T --expect alt-u --expect alt-a"
+            additional_keybindings="--expect alt-c --expect alt-s --expect ctrl-alt-s --expect alt-t --expect ctrl-alt-t --expect alt-u --expect alt-a"
             additional_message=$kak_opt_fzf_tag_asciidoc ;;
         asm)
             additional_keybindings="--expect alt-d --expect alt-l --expect alt-m --expect alt-t --expect alt-s"
@@ -1302,10 +1303,10 @@ define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
             additional_keybindings="--expect alt-p --expect alt-t --expect alt-m --expect alt-w --expect alt-e --expect alt-s --expect alt-c --expect alt-d"
             additional_message=$kak_opt_fzf_tag_autoconf ;;
         autoit)
-            additional_keybindings="--expect alt-f --expect alt-r --expect alt-g --expect alt-l --expect alt-S"
+            additional_keybindings="--expect alt-f --expect alt-r --expect alt-g --expect alt-l --expect ctrl-alt-s"
             additional_message=$kak_opt_fzf_tag_autoit ;;
         automake)
-            additional_keybindings="--expect alt-d --expect alt-P --expect alt-M --expect alt-T --expect alt-L --expect alt-S --expect alt-D --expect alt-c"
+            additional_keybindings="--expect alt-d --expect ctrl-alt-p --expect ctrl-alt-m --expect ctrl-alt-t --expect ctrl-alt-l --expect ctrl-alt-s --expect ctrl-alt-d --expect alt-c"
             additional_message=$kak_opt_fzf_tag_automake ;;
         awk)
             additional_keybindings="--expect alt-f"
@@ -1320,13 +1321,13 @@ define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
             additional_keybindings="--expect alt-f --expect alt-n"
             additional_message=$kak_opt_fzf_tag_clojure ;;
         cmake)
-            additional_keybindings="--expect alt-f --expect alt-m --expect alt-t --expect alt-v --expect alt-D --expect alt-p --expect alt-r"
+            additional_keybindings="--expect alt-f --expect alt-m --expect alt-t --expect alt-v --expect ctrl-alt-d --expect alt-p --expect alt-r"
             additional_message=$kak_opt_fzf_tag_cmake ;;
         c)
-            additional_keybindings="--expect alt-d --expect alt-e --expect alt-f --expect alt-g --expect alt-h --expect alt-l --expect alt-m --expect alt-p --expect alt-s --expect alt-t --expect alt-u --expect alt-v --expect alt-x --expect alt-z --expect alt-L"
+            additional_keybindings="--expect alt-d --expect alt-e --expect alt-f --expect alt-g --expect alt-h --expect alt-l --expect alt-m --expect alt-p --expect alt-s --expect alt-t --expect alt-u --expect alt-v --expect alt-x --expect alt-z --expect ctrl-alt-l"
             additional_message=$kak_opt_fzf_tag_c ;;
         cpp)
-            additional_keybindings="--expect alt-d --expect alt-e --expect alt-f --expect alt-g --expect alt-h --expect alt-l --expect alt-m --expect alt-p --expect alt-s --expect alt-t --expect alt-u --expect alt-v --expect alt-x --expect alt-z --expect alt-L --expect alt-c --expect alt-n --expect alt-A --expect alt-N --expect alt-U"
+            additional_keybindings="--expect alt-d --expect alt-e --expect alt-f --expect alt-g --expect alt-h --expect alt-l --expect alt-m --expect alt-p --expect alt-s --expect alt-t --expect alt-u --expect alt-v --expect alt-x --expect alt-z --expect ctrl-alt-l --expect alt-c --expect alt-n --expect ctrl-alt-a --expect ctrl-alt-n --expect ctrl-alt-u"
             additional_message=$kak_opt_fzf_tag_cpp ;;
         cpreprocessor)
             additional_keybindings="--expect alt-d --expect alt-h"
@@ -1335,22 +1336,25 @@ define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
             additional_keybindings="--expect alt-c --expect alt-s --expect alt-i"
             additional_message=$kak_opt_fzf_tag_css ;;
         csharp)
-            additional_keybindings="--expect alt-c --expect alt-d --expect alt-e --expect alt-E --expect alt-f --expect alt-g --expect alt-i --expect alt-l --expect alt-m --expect alt-n --expect alt-p --expect alt-s --expect alt-t"
+            additional_keybindings="--expect alt-c --expect alt-d --expect alt-e --expect ctrl-alt-e --expect alt-f --expect alt-g --expect alt-i --expect alt-l --expect alt-m --expect alt-n --expect alt-p --expect alt-s --expect alt-t"
             additional_message=$kak_opt_fzf_tag_csharp ;;
         ctags)
             additional_keybindings="--expect alt-l --expect alt-k"
             additional_message=$kak_opt_fzf_tag_ctags ;;
         cobol)
-            additional_keybindings="--expect alt-p --expect alt-d --expect alt-S --expect alt-f --expect alt-g --expect alt-P --expect alt-s --expect alt-D"
+            additional_keybindings="--expect alt-p --expect alt-d --expect ctrl-alt-s --expect ctrl-alt-F --expect alt-g --expect ctrl-alt-p --expect alt-s --expect ctrl-alt-d"
             additional_message=$kak_opt_fzf_tag_cobol ;;
         cuda)
-            additional_keybindings="--expect alt-d --expect alt-e --expect alt-f --expect alt-g --expect alt-h --expect alt-l --expect alt-m --expect alt-p --expect alt-s --expect alt-t --expect alt-u --expect alt-v --expect alt-x --expect alt-z --expect alt-L"
+            additional_keybindings="--expect alt-d --expect alt-e --expect alt-f --expect alt-g --expect alt-h --expect alt-l --expect alt-m --expect alt-p --expect alt-s --expect alt-t --expect alt-u --expect alt-v --expect alt-x --expect alt-z --expect ctrl-alt-l"
             additional_message=$kak_opt_fzf_tag_cuda ;;
         d)
-            additional_keybindings="--expect alt-a --expect alt-c --expect alt-g --expect alt-e --expect alt-x --expect alt-f --expect alt-i --expect alt-l --expect alt-m --expect alt-X --expect alt-M --expect alt-n --expect alt-p --expect alt-s --expect alt-T --expect alt-u --expect alt-v --expect alt-V"
+            additional_keybindings="--expect alt-a --expect alt-c --expect alt-g --expect alt-e --expect alt-x --expect alt-f --expect alt-i --expect alt-l --expect alt-m --expect ctrl-alt-x --expect ctrl-alt-m --expect alt-n --expect alt-p --expect alt-s --expect ctrl-alt-t --expect alt-u --expect alt-v --expect ctrl-alt-v"
             additional_message=$kak_opt_fzf_tag_d ;;
-        ddtd)
-            additional_keybindings="--expect alt-E --expect alt-p --expect alt-e --expect alt-a --expect alt-n"
+        diff)
+            additional_keybindings="--expect alt-m --expect alt-n --expect alt-d --expect alt-h"
+            additional_message=$kak_opt_fzf_tag_diff ;;
+        dtd)
+            additional_keybindings="--expect ctrl-alt-e --expect alt-p --expect alt-e --expect alt-a --expect alt-n"
             additional_message=$kak_opt_fzf_tag_dtd ;;
         dts)
             additional_keybindings="--expect alt-p --expect alt-l --expect alt-r"
@@ -1358,8 +1362,11 @@ define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
         dosbatch)
             additional_keybindings="--expect alt-l --expect alt-v"
             additional_message=$kak_opt_fzf_tag_dosbatch ;;
-        eelm)
-            additional_keybindings="--expect alt-m --expect alt-n --expect alt-p --expect alt-t --expect alt-c --expect alt-a --expect alt-f"
+        eiffel)
+            additional_keybindings="--expect alt-c --expect alt-f --expect alt-l"
+            additional_message=$kak_opt_fzf_tag_eiffel ;;
+        elm)
+            additional_keybindings="--expect ctrl-alt-M --expect ctrl-alt-N --expect ctrl-alt-P --expect ctrl-alt-T --expect ctrl-alt-C --expect ctrl-alt-A --expect ctrl-alt-F"
             additional_message=$kak_opt_fzf_tag_elm ;;
         erlang)
             additional_keybindings="--expect alt-d --expect alt-f --expect alt-m --expect alt-r --expect alt-t"
@@ -1371,25 +1378,25 @@ define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
             additional_keybindings="--expect alt-f --expect alt-c --expect alt-m --expect alt-p --expect alt-v --expect alt-x"
             additional_message=$kak_opt_fzf_tag_flex ;;
         fortran)
-            additional_keybindings="--expect alt-b --expect alt-c --expect alt-e --expect alt-E --expect alt-f --expect alt-i --expect alt-k --expect alt-l --expect alt-L --expect alt-m --expect alt-M --expect alt-n --expect alt-N --expect alt-p --expect alt-P --expect alt-s --expect alt-t --expect alt-v --expect alt-S"
+            additional_keybindings="--expect alt-b --expect alt-c --expect alt-e --expect ctrl-alt-e --expect alt-f --expect alt-i --expect alt-k --expect alt-l --expect ctrl-alt-l --expect alt-m --expect ctrl-alt-m --expect alt-n --expect ctrl-alt-n --expect alt-p --expect ctrl-alt-p --expect alt-s --expect alt-t --expect alt-v --expect ctrl-alt-s"
             additional_message=$kak_opt_fzf_tag_fortran ;;
         fypp)
             additional_keybindings="--expect alt-m"
             additional_message=$kak_opt_fzf_tag_fypp ;;
         gdbinit)
-            additional_keybindings="--expect alt-d --expect alt-D --expect alt-t --expect alt-l"
+            additional_keybindings="--expect alt-d --expect ctrl-alt-d --expect alt-t --expect alt-l"
             additional_message=$kak_opt_fzf_tag_gdbinit ;;
         go)
-            additional_keybindings="--expect alt-p --expect alt-f --expect alt-c --expect alt-t --expect alt-v --expect alt-s --expect alt-i --expect alt-m --expect alt-M --expect alt-u --expect alt-P"
+            additional_keybindings="--expect alt-p --expect alt-f --expect alt-c --expect alt-t --expect alt-v --expect alt-s --expect alt-i --expect alt-m --expect ctrl-alt-m --expect alt-u --expect ctrl-alt-p"
             additional_message=$kak_opt_fzf_tag_go ;;
         html)
-            additional_keybindings="--expect alt-a --expect alt-h --expect alt-i --expect alt-j"
+            additional_keybindings="--expect alt-a --expect ctrl-alt-H --expect ctrl-alt-I --expect ctrl-alt-J"
             additional_message=$kak_opt_fzf_tag_html ;;
         iniconf)
             additional_keybindings="--expect alt-s --expect alt-k"
             additional_message=$kak_opt_fzf_tag_iniconf ;;
         itcl)
-            additional_keybindings="--expect alt-c --expect alt-m --expect alt-v --expect alt-C --expect alt-p"
+            additional_keybindings="--expect alt-c --expect alt-m --expect alt-v --expect ctrl-alt-c --expect alt-p"
             additional_message=$kak_opt_fzf_tag_itcl ;;
         java)
             additional_keybindings="--expect alt-a --expect alt-c --expect alt-e --expect alt-f --expect alt-g --expect alt-i --expect alt-l --expect alt-m --expect alt-p"
@@ -1398,13 +1405,13 @@ define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
             additional_keybindings="--expect alt-k"
             additional_message=$kak_opt_fzf_tag_javaproperties ;;
         javascript)
-            additional_keybindings="--expect alt-f --expect alt-c --expect alt-m --expect alt-p --expect alt-C --expect alt-v --expect alt-g"
+            additional_keybindings="--expect alt-f --expect alt-c --expect alt-m --expect alt-p --expect ctrl-alt-c --expect alt-v --expect alt-g"
             additional_message=$kak_opt_fzf_tag_javascript ;;
         json)
             additional_keybindings="--expect alt-o --expect alt-a --expect alt-n --expect alt-s --expect alt-b --expect alt-z"
             additional_message=$kak_opt_fzf_tag_json ;;
         ldscript)
-            additional_keybindings="--expect alt-S --expect alt-s --expect alt-v --expect alt-i"
+            additional_keybindings="--expect ctrl-alt-s --expect alt-s --expect alt-v --expect alt-i"
             additional_message=$kak_opt_fzf_tag_ldscript ;;
         lisp)
             additional_keybindings="--expect alt-f"
@@ -1413,16 +1420,16 @@ define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
             additional_keybindings="--expect alt-f"
             additional_message=$kak_opt_fzf_tag_lua ;;
         m4)
-            additional_keybindings="--expect alt-d --expect alt-I"
+            additional_keybindings="--expect alt-d --expect ctrl-alt-i"
             additional_message=$kak_opt_fzf_tag_m4 ;;
         man)
             additional_keybindings="--expect alt-t --expect alt-s"
             additional_message=$kak_opt_fzf_tag_man ;;
         make)
-            additional_keybindings="--expect alt-m --expect alt-t --expect alt-I"
+            additional_keybindings="--expect alt-m --expect alt-t --expect ctrl-alt-i"
             additional_message=$kak_opt_fzf_tag_make ;;
         markdown)
-            additional_keybindings="--expect alt-c --expect alt-s --expect alt-S --expect alt-t --expect alt-T --expect alt-u --expect alt-r"
+            additional_keybindings="--expect alt-c --expect alt-s --expect ctrl-alt-s --expect alt-t --expect ctrl-alt-t --expect alt-u --expect alt-r"
             additional_message=$kak_opt_fzf_tag_markdown ;;
         matlab)
             additional_keybindings="--expect alt-f --expect alt-v --expect alt-c"
@@ -1431,10 +1438,10 @@ define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
             additional_keybindings="--expect alt-f --expect alt-c --expect alt-v --expect alt-t --expect alt-r --expect alt-p"
             additional_message=$kak_opt_fzf_tag_myrddin ;;
         objectivec)
-            additional_keybindings="--expect alt-i --expect alt-I --expect alt-P --expect alt-m --expect alt-c --expect alt-v --expect alt-E --expect alt-f --expect alt-p --expect alt-t --expect alt-s --expect alt-e --expect alt-M"
+            additional_keybindings="--expect alt-i --expect ctrl-alt-i --expect ctrl-alt-p --expect ctrl-alt-M --expect ctrl-alt-C --expect ctrl-alt-V --expect ctrl-alt-e --expect ctrl-alt-F --expect ctrl-alt-P --expect ctrl-alt-T --expect ctrl-alt-S --expect ctrl-alt-E --expect ctrl-alt-m"
             additional_message=$kak_opt_fzf_tag_objectivec ;;
         ocaml)
-            additional_keybindings="--expect alt-c --expect alt-m --expect alt-M --expect alt-v --expect alt-p --expect alt-t --expect alt-f --expect alt-C --expect alt-r --expect alt-e"
+            additional_keybindings="--expect alt-c --expect ctrl-alt-M --expect ctrl-alt-m --expect ctrl-alt-V --expect ctrl-alt-P --expect ctrl-alt-T --expect ctrl-alt-F --expect ctrl-alt-c --expect ctrl-alt-R --expect ctrl-alt-E"
             additional_message=$kak_opt_fzf_tag_ocaml ;;
         passwd)
             additional_keybindings="--expect alt-u"
@@ -1452,22 +1459,25 @@ define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
             additional_keybindings="--expect alt-c --expect alt-d --expect alt-f --expect alt-i --expect alt-l --expect alt-n --expect alt-t --expect alt-v --expect alt-a"
             additional_message=$kak_opt_fzf_tag_php ;;
         pod)
-            additional_keybindings="--expect alt-c --expect alt-s --expect alt-S --expect alt-t"
+            additional_keybindings="--expect alt-c --expect alt-s --expect ctrl-alt-s --expect alt-t"
             additional_message=$kak_opt_fzf_tag_pod ;;
         protobuf)
-            additional_keybindings="--expect alt-p --expect alt-m --expect alt-f --expect alt-e --expect alt-g --expect alt-s --expect alt-r"
+            additional_keybindings="--expect alt-p --expect alt-m --expect alt-f --expect alt-e --expect alt-g --expect alt-s --expect ctrl-alt-R"
             additional_message=$kak_opt_fzf_tag_protobuf ;;
-        puppetmanpython)
-            additional_keybindings="--expect alt-c --expect alt-f --expect alt-m --expect alt-v --expect alt-I --expect alt-i --expect alt-x --expect alt-z --expect alt-l"
+        puppetmanifest)
+            additional_keybindings="--expect alt-c --expect alt-d --expect alt-n --expect alt-r --expect alt-v"
+            additional_message=$kak_opt_fzf_tag_puppetmanifest ;;
+        python)
+            additional_keybindings="--expect alt-c --expect alt-f --expect alt-m --expect alt-v --expect ctrl-alt-i --expect alt-i --expect alt-x --expect alt-z --expect alt-l"
             additional_message=$kak_opt_fzf_tag_python ;;
         pythonloggingconfig)
-            additional_keybindings="--expect alt-L --expect alt-q"
+            additional_keybindings="--expect ctrl-alt-l --expect alt-q"
             additional_message=$kak_opt_fzf_tag_pythonloggingconfig ;;
         qemuhx)
-            additional_keybindings="--expect alt-q --expect alt-i"
+            additional_keybindings="--expect ctrl-alt-Q --expect alt-i"
             additional_message=$kak_opt_fzf_tag_qemuhx ;;
         qtmoc)
-            additional_keybindings="--expect alt-s --expect alt-S --expect alt-p"
+            additional_keybindings="--expect alt-s --expect ctrl-alt-s --expect alt-p"
             additional_message=$kak_opt_fzf_tag_qtmoc ;;
         r)
             additional_keybindings="--expect alt-f --expect alt-l --expect alt-s --expect alt-g --expect alt-v"
@@ -1485,13 +1495,13 @@ define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
             additional_keybindings="--expect alt-t --expect alt-m --expect alt-p --expect alt-g"
             additional_message=$kak_opt_fzf_tag_rpmspec ;;
         restructuredtext)
-            additional_keybindings="--expect alt-c --expect alt-s --expect alt-S --expect alt-t --expect alt-T"
+            additional_keybindings="--expect alt-c --expect alt-s --expect ctrl-alt-s --expect alt-t --expect ctrl-alt-t"
             additional_message=$kak_opt_fzf_tag_restructuredtext ;;
         ruby)
-            additional_keybindings="--expect alt-c --expect alt-f --expect alt-m --expect alt-S"
+            additional_keybindings="--expect alt-c --expect alt-f --expect alt-m --expect ctrl-alt-s"
             additional_message=$kak_opt_fzf_tag_ruby ;;
         rust)
-            additional_keybindings="--expect alt-n --expect alt-s --expect alt-i --expect alt-c --expect alt-f --expect alt-g --expect alt-t --expect alt-v --expect alt-M --expect alt-m --expect alt-e --expect alt-P"
+            additional_keybindings="--expect alt-n --expect alt-s --expect alt-i --expect alt-c --expect ctrl-alt-F --expect ctrl-alt-G --expect ctrl-alt-T --expect ctrl-alt-V --expect ctrl-alt-m --expect ctrl-alt-M --expect ctrl-alt-E --expect ctrl-alt-p"
             additional_message=$kak_opt_fzf_tag_rust ;;
         scheme)
             additional_keybindings="--expect alt-f --expect alt-s"
@@ -1506,7 +1516,7 @@ define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
             additional_keybindings="--expect alt-e --expect alt-f --expect alt-c --expect alt-s --expect alt-r --expect alt-t --expect alt-v"
             additional_message=$kak_opt_fzf_tag_sml ;;
         sql)
-            additional_keybindings="--expect alt-c --expect alt-d --expect alt-f --expect alt-E --expect alt-l --expect alt-L --expect alt-P --expect alt-p --expect alt-r --expect alt-s --expect alt-t --expect alt-T --expect alt-v --expect alt-i --expect alt-e --expect alt-U --expect alt-R --expect alt-D --expect alt-V --expect alt-n --expect alt-x --expect alt-y --expect alt-z"
+            additional_keybindings="--expect alt-c --expect alt-d --expect alt-f --expect ctrl-alt-e --expect alt-l --expect ctrl-alt-l --expect ctrl-alt-p --expect alt-p --expect alt-r --expect alt-s --expect alt-t --expect ctrl-alt-t --expect alt-v --expect alt-i --expect alt-e --expect ctrl-alt-u --expect ctrl-alt-r --expect ctrl-alt-d --expect ctrl-alt-v --expect alt-n --expect ctrl-alt-X --expect ctrl-alt-Y --expect ctrl-alt-Z"
             additional_message=$kak_opt_fzf_tag_sql ;;
         systemdunit)
             additional_keybindings="--expect alt-u"
@@ -1518,22 +1528,22 @@ define-command -hidden fzf-tag -params ..1 %{ evaluate-commands %sh{
             additional_keybindings="--expect alt-c --expect alt-m"
             additional_message=$kak_opt_fzf_tag_tcloo ;;
         tex)
-            additional_keybindings="--expect alt-p --expect alt-c --expect alt-s --expect alt-u --expect alt-b --expect alt-P --expect alt-G --expect alt-l --expect alt-i"
+            additional_keybindings="--expect alt-p --expect alt-c --expect alt-s --expect alt-u --expect alt-b --expect ctrl-alt-p --expect ctrl-alt-g --expect alt-l --expect alt-i"
             additional_message=$kak_opt_fzf_tag_tex ;;
         ttcn)
-            additional_keybindings="--expect alt-M --expect alt-t --expect alt-c --expect alt-d --expect alt-f --expect alt-s --expect alt-C --expect alt-a --expect alt-G --expect alt-P --expect alt-v --expect alt-T --expect alt-p --expect alt-m --expect alt-e"
+            additional_keybindings="--expect ctrl-alt-m --expect alt-t --expect alt-c --expect alt-d --expect alt-f --expect alt-s --expect ctrl-alt-c --expect alt-a --expect ctrl-alt-g --expect ctrl-alt-p --expect alt-v --expect ctrl-alt-t --expect alt-p --expect alt-m --expect alt-e"
             additional_message=$kak_opt_fzf_tag_ttcn ;;
         vera)
-            additional_keybindings="--expect alt-c --expect alt-d --expect alt-e --expect alt-f --expect alt-g --expect alt-i --expect alt-l --expect alt-m --expect alt-p --expect alt-P --expect alt-s --expect alt-t --expect alt-T --expect alt-v --expect alt-x --expect alt-h"
+            additional_keybindings="--expect alt-c --expect alt-d --expect alt-e --expect alt-f --expect alt-g --expect alt-i --expect alt-l --expect alt-m --expect alt-p --expect ctrl-alt-p --expect alt-s --expect alt-t --expect ctrl-alt-t --expect alt-v --expect alt-x --expect alt-h"
             additional_message=$kak_opt_fzf_tag_vera ;;
         verilog)
             additional_keybindings="--expect alt-c --expect alt-e --expect alt-f --expect alt-m --expect alt-n --expect alt-p --expect alt-r --expect alt-t --expect alt-b"
             additional_message=$kak_opt_fzf_tag_verilog ;;
         systemverilog)
-            additional_keybindings="--expect alt-c --expect alt-e --expect alt-f --expect alt-m --expect alt-n --expect alt-p --expect alt-r --expect alt-t --expect alt-b --expect alt-A --expect alt-C --expect alt-V --expect alt-E --expect alt-I --expect alt-M --expect alt-K --expect alt-P --expect alt-Q --expect alt-R --expect alt-S --expect alt-T"
+            additional_keybindings="--expect alt-c --expect alt-e --expect alt-f --expect alt-m --expect alt-n --expect alt-p --expect alt-r --expect alt-t --expect alt-b --expect ctrl-alt-a --expect ctrl-alt-c --expect ctrl-alt-v --expect ctrl-alt-e --expect ctrl-alt-i --expect ctrl-alt-m --expect ctrl-alt-k --expect ctrl-alt-p --expect ctrl-alt-q --expect ctrl-alt-r --expect ctrl-alt-s --expect ctrl-alt-t"
             additional_message=$kak_opt_fzf_tag_systemverilog ;;
         vhdl)
-            additional_keybindings="--expect alt-c --expect alt-t --expect alt-T --expect alt-r --expect alt-e --expect alt-C --expect alt-d --expect alt-f --expect alt-p --expect alt-P --expect alt-l"
+            additional_keybindings="--expect alt-c --expect alt-t --expect ctrl-alt-t --expect alt-r --expect alt-e --expect ctrl-alt-c --expect alt-d --expect alt-f --expect alt-p --expect ctrl-alt-p --expect alt-l"
             additional_message=$kak_opt_fzf_tag_vhdl ;;
         vim)
             additional_keybindings="--expect alt-a --expect alt-c --expect alt-f --expect alt-m --expect alt-v --expect alt-n"