From cf959501b13f9fb59a96b0ee54b5d3e08efb0efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Sat, 8 Jul 2017 12:55:01 +0200
Subject: vis: perform more renames cursor -> selection

To fix compilation you need to update (or remove) config.h.
---
 config.def.h | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'config.def.h')

diff --git a/config.def.h b/config.def.h
index d5fef01..b98eeab 100644
--- a/config.def.h
+++ b/config.def.h
@@ -154,8 +154,8 @@ static const KeyBinding bindings_selections[] = {
 //	{ "-",                  ACTION(SELECTIONS_ROTATE_LEFT)              },
 //	{ "+",                  ACTION(SELECTIONS_ROTATE_RIGHT)             },
 	{ "_",                  ACTION(SELECTIONS_TRIM)                     },
-	{ "<S-Tab>",            ACTION(CURSORS_ALIGN_INDENT_RIGHT)          },
-	{ "<Tab>",              ACTION(CURSORS_ALIGN_INDENT_LEFT)           },
+	{ "<S-Tab>",            ACTION(SELECTIONS_ALIGN_INDENT_RIGHT)       },
+	{ "<Tab>",              ACTION(SELECTIONS_ALIGN_INDENT_LEFT)        },
 	{ 0 /* empty last element, array terminator */                      },
 };
 
@@ -205,19 +205,19 @@ static const KeyBinding bindings_normal[] = {
 	{ "~",                  ALIAS("<vis-operator-case-swap>ll")         },
 	{ "C",                  ALIAS("c$")                                 },
 	{ "<C-b>",              ALIAS("<PageUp>")                           },
-	{ "<C-c>",              ACTION(CURSORS_REMOVE_COLUMN)               },
-	{ "<C-d>",              ACTION(CURSORS_NEXT)                        },
+	{ "<C-c>",              ACTION(SELECTIONS_REMOVE_COLUMN)            },
+	{ "<C-d>",              ACTION(SELECTIONS_NEXT)                     },
 	{ "<C-e>",              ACTION(WINDOW_SLIDE_UP)                     },
 	{ "<C-f>",              ALIAS("<PageDown>")                         },
 	{ "<C-i>",              ACTION(JUMPLIST_NEXT)                       },
-	{ "<C-j>",              ACTION(CURSORS_NEW_LINE_BELOW)              },
-	{ "<C-k>",              ACTION(CURSORS_NEW_LINE_ABOVE)              },
-	{ "<C-l>",              ACTION(CURSORS_REMOVE_COLUMN_EXCEPT)        },
-	{ "<C-n>",              ACTION(CURSOR_SELECT_WORD)                  },
+	{ "<C-j>",              ACTION(SELECTIONS_NEW_LINE_BELOW)           },
+	{ "<C-k>",              ACTION(SELECTIONS_NEW_LINE_ABOVE)           },
+	{ "<C-l>",              ACTION(SELECTIONS_REMOVE_COLUMN_EXCEPT)     },
+	{ "<C-n>",              ACTION(SELECTIONS_MATCH_WORD)               },
 	{ "<C-o>",              ACTION(JUMPLIST_PREV)                       },
-	{ "<C-p>",              ACTION(CURSORS_REMOVE_LAST)                 },
+	{ "<C-p>",              ACTION(SELECTIONS_REMOVE_LAST)              },
 	{ "<C-r>",              ACTION(REDO)                                },
-	{ "<C-u>",              ACTION(CURSORS_PREV)                        },
+	{ "<C-u>",              ACTION(SELECTIONS_PREV)                     },
 	{ "<C-w><Backspace>",   ALIAS("<C-w>k")                             },
 	{ "<C-w>c",             ALIAS(":q<Enter>")                          },
 	{ "<C-w><C-h>",         ALIAS("<C-w>k")                             },
@@ -236,7 +236,7 @@ static const KeyBinding bindings_normal[] = {
 	{ "<C-y>",              ACTION(WINDOW_SLIDE_DOWN)                   },
 	{ "D",                  ALIAS("d$")                                 },
 	{ "<Delete>",           ALIAS("x")                                  },
-	{ "<Escape>",           ACTION(CURSORS_REMOVE_ALL)                  },
+	{ "<Escape>",           ACTION(SELECTIONS_REMOVE_ALL)               },
 	{ "<F1>",               ALIAS(":help<Enter>")                       },
 	{ "ga",                 ACTION(UNICODE_INFO)                        },
 	{ "g8",                 ACTION(UTF8_INFO)                           },
@@ -251,14 +251,14 @@ static const KeyBinding bindings_normal[] = {
 	{ "i",                  ACTION(MODE_INSERT)                         },
 	{ "J",                  ACTION(JOIN_LINES)                          },
 	{ "gJ",                 ACTION(JOIN_LINES_TRIM)                     },
-	{ "<M-C-j>",            ACTION(CURSORS_NEW_LINE_BELOW_LAST)         },
-	{ "<M-C-k>",            ACTION(CURSORS_NEW_LINE_ABOVE_FIRST)        },
+	{ "<M-C-j>",            ACTION(SELECTIONS_NEW_LINE_BELOW_LAST)      },
+	{ "<M-C-k>",            ACTION(SELECTIONS_NEW_LINE_ABOVE_FIRST)     },
 	{ "O",                  ACTION(OPEN_LINE_ABOVE)                     },
 	{ "o",                  ACTION(OPEN_LINE_BELOW)                     },
 	{ "q",                  ACTION(MACRO_RECORD)                        },
 	{ "R",                  ACTION(MODE_REPLACE)                        },
 	{ "r",                  ACTION(REPLACE_CHAR)                        },
-	{ "<Tab>",              ACTION(CURSORS_ALIGN)                       },
+	{ "<Tab>",              ACTION(SELECTIONS_ALIGN)                    },
 	{ "u",                  ACTION(UNDO)                                },
 	{ "v",                  ACTION(MODE_VISUAL)                         },
 	{ "V",                  ACTION(MODE_VISUAL_LINE)                    },
@@ -274,7 +274,7 @@ static const KeyBinding bindings_normal[] = {
 };
 
 static const KeyBinding bindings_visual[] = {
-	{ "A",                  ACTION(CURSORS_NEW_LINES_END)               },
+	{ "A",                  ACTION(SELECTIONS_NEW_LINES_END)            },
 	{ "@",                  ACTION(MACRO_REPLAY)                        },
 	{ ":",                  ACTION(PROMPT_SHOW)                         },
 	{ "-",                  ACTION(SELECTIONS_ROTATE_LEFT)              },
@@ -283,20 +283,20 @@ static const KeyBinding bindings_visual[] = {
 	{ ">",                  ALIAS("<vis-operator-shift-right>gv")       },
 	{ "<Backspace>",        ALIAS("d")                                  },
 	{ "<C-b>",              ALIAS("<PageUp>")                           },
-	{ "<C-c>",              ACTION(CURSORS_REMOVE_COLUMN)               },
-	{ "<C-d>",              ACTION(CURSORS_NEXT)                        },
+	{ "<C-c>",              ACTION(SELECTIONS_REMOVE_COLUMN)            },
+	{ "<C-d>",              ACTION(SELECTIONS_NEXT)                     },
 	{ "<C-f>",              ALIAS("<PageDown>")                         },
 	{ "<C-h>",              ALIAS("<Backspace>")                        },
 	{ "<C-j>",              ALIAS("<C-d>")                              },
 	{ "<C-k>",              ALIAS("<C-u>")                              },
-	{ "<C-l>",              ACTION(CURSORS_REMOVE_COLUMN_EXCEPT)        },
-	{ "<C-n>",              ACTION(CURSORS_NEW_MATCH_NEXT)              },
-	{ "<C-p>",              ACTION(CURSORS_REMOVE_LAST)                 },
-	{ "<C-u>",              ACTION(CURSORS_PREV)                        },
-	{ "<C-x>",              ACTION(CURSORS_NEW_MATCH_SKIP)              },
+	{ "<C-l>",              ACTION(SELECTIONS_REMOVE_COLUMN_EXCEPT)     },
+	{ "<C-n>",              ACTION(SELECTIONS_NEW_MATCH_NEXT)           },
+	{ "<C-p>",              ACTION(SELECTIONS_REMOVE_LAST)              },
+	{ "<C-u>",              ACTION(SELECTIONS_PREV)                     },
+	{ "<C-x>",              ACTION(SELECTIONS_NEW_MATCH_SKIP)           },
 	{ "<Delete>",           ALIAS("<Backspace>")                        },
 	{ "<Escape>",           ACTION(MODE_NORMAL)                         },
-	{ "I",                  ACTION(CURSORS_NEW_LINES_BEGIN)             },
+	{ "I",                  ACTION(SELECTIONS_NEW_LINES_BEGIN)          },
 	{ "J",                  ACTION(JOIN_LINES)                          },
 	{ "gJ",                 ACTION(JOIN_LINES_TRIM)                     },
 	{ "o",                  ACTION(SELECTION_FLIP)                      },
@@ -338,7 +338,7 @@ static const KeyBinding bindings_insert[] = {
 	{ "<C-x><C-y>",         ACTION(WINDOW_SLIDE_DOWN)                   },
 	{ "<Enter>",            ACTION(INSERT_NEWLINE)                      },
 	{ "<Escape>",           ACTION(MODE_NORMAL)                         },
-	{ "<S-Tab>",            ACTION(CURSORS_ALIGN_INDENT_LEFT)           },
+	{ "<S-Tab>",            ACTION(SELECTIONS_ALIGN_INDENT_LEFT)        },
 	{ "<Tab>",              ACTION(INSERT_TAB)                          },
 	{ 0 /* empty last element, array terminator */                      },
 };
-- 
cgit v1.2.3