vis

commit 78c148ff9bf2474617d58fafd73a5db8decd3ccf
parent 37485259ad56be69fb5a43f18d66a28226f53a3e
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Wed, 14 Mar 2018 10:52:10 +0100

Merge branch 'paranthese-typo' of https://github.com/Two-Finger/vis

Diffstat:
M
config.def.h
 | 
4
++--
M
main.c
 | 
12
++++++------
M
text-motions.c
 | 
4
++--
M
text-objects.c
 | 
2
+-
M
text-objects.h
 | 
2
+-
M
vis-text-objects.c
 | 
8
++++----
M
vis.h
 | 
4
++--

7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -94,7 +94,7 @@ static const KeyBinding bindings_textobjects[] = {
 	{ "a<",                 ACTION(TEXT_OBJECT_ANGLE_BRACKET_OUTER)     },
 	{ "a`",                 ACTION(TEXT_OBJECT_BACKTICK_OUTER)          },
 	{ "a{",                 ACTION(TEXT_OBJECT_CURLY_BRACKET_OUTER)     },
-	{ "a(",                 ACTION(TEXT_OBJECT_PARANTHESE_OUTER)        },
+	{ "a(",                 ACTION(TEXT_OBJECT_PARENTHESIS_OUTER)       },
 	{ "a\"",                ACTION(TEXT_OBJECT_QUOTE_OUTER)             },
 	{ "a\'",                ACTION(TEXT_OBJECT_SINGLE_QUOTE_OUTER)      },
 	{ "a[",                 ACTION(TEXT_OBJECT_SQUARE_BRACKET_OUTER)    },
@@ -116,7 +116,7 @@ static const KeyBinding bindings_textobjects[] = {
 	{ "i<",                 ACTION(TEXT_OBJECT_ANGLE_BRACKET_INNER)     },
 	{ "i`",                 ACTION(TEXT_OBJECT_BACKTICK_INNER)          },
 	{ "i{",                 ACTION(TEXT_OBJECT_CURLY_BRACKET_INNER)     },
-	{ "i(",                 ACTION(TEXT_OBJECT_PARANTHESE_INNER)        },
+	{ "i(",                 ACTION(TEXT_OBJECT_PARENTHESIS_INNER)       },
 	{ "i\"",                ACTION(TEXT_OBJECT_QUOTE_INNER)             },
 	{ "i\'",                ACTION(TEXT_OBJECT_SINGLE_QUOTE_INNER)      },
 	{ "i[",                 ACTION(TEXT_OBJECT_SQUARE_BRACKET_INNER)    },
diff --git a/main.c b/main.c
@@ -307,8 +307,8 @@ enum {
 	VIS_ACTION_TEXT_OBJECT_PARAGRAPH_OUTER,
 	VIS_ACTION_TEXT_OBJECT_SQUARE_BRACKET_OUTER,
 	VIS_ACTION_TEXT_OBJECT_SQUARE_BRACKET_INNER,
-	VIS_ACTION_TEXT_OBJECT_PARANTHESE_OUTER,
-	VIS_ACTION_TEXT_OBJECT_PARANTHESE_INNER,
+	VIS_ACTION_TEXT_OBJECT_PARENTHESIS_OUTER,
+	VIS_ACTION_TEXT_OBJECT_PARENTHESIS_INNER,
 	VIS_ACTION_TEXT_OBJECT_ANGLE_BRACKET_OUTER,
 	VIS_ACTION_TEXT_OBJECT_ANGLE_BRACKET_INNER,
 	VIS_ACTION_TEXT_OBJECT_CURLY_BRACKET_OUTER,
@@ -1134,15 +1134,15 @@ static const KeyAction vis_action[] = {
 		VIS_HELP("[] block (inner variant)")
 		textobj, { .i = VIS_TEXTOBJECT_INNER_SQUARE_BRACKET }
 	},
-	[VIS_ACTION_TEXT_OBJECT_PARANTHESE_OUTER] = {
+	[VIS_ACTION_TEXT_OBJECT_PARENTHESIS_OUTER] = {
 		"vis-textobject-parentheses-outer",
 		VIS_HELP("() block (outer variant)")
-		textobj, { .i = VIS_TEXTOBJECT_OUTER_PARANTHESE }
+		textobj, { .i = VIS_TEXTOBJECT_OUTER_PARENTHESIS }
 	},
-	[VIS_ACTION_TEXT_OBJECT_PARANTHESE_INNER] = {
+	[VIS_ACTION_TEXT_OBJECT_PARENTHESIS_INNER] = {
 		"vis-textobject-parentheses-inner",
 		VIS_HELP("() block (inner variant)")
-		textobj, { .i = VIS_TEXTOBJECT_INNER_PARANTHESE }
+		textobj, { .i = VIS_TEXTOBJECT_INNER_PARENTHESIS }
 	},
 	[VIS_ACTION_TEXT_OBJECT_ANGLE_BRACKET_OUTER] = {
 		"vis-textobject-angle-bracket-outer",
diff --git a/text-motions.c b/text-motions.c
@@ -515,12 +515,12 @@ size_t text_block_end(Text *txt, size_t pos) {
 }
 
 size_t text_parenthese_start(Text *txt, size_t pos) {
-	Filerange r = text_object_paranthese(txt, pos-1);
+	Filerange r = text_object_parenthesis(txt, pos-1);
 	return text_range_valid(&r) ? r.start-1 : pos;
 }
 
 size_t text_parenthese_end(Text *txt, size_t pos) {
-	Filerange r = text_object_paranthese(txt, pos+1);
+	Filerange r = text_object_parenthesis(txt, pos+1);
 	return text_range_valid(&r) ? r.end : pos;
 }
 
diff --git a/text-objects.c b/text-objects.c
@@ -274,7 +274,7 @@ Filerange text_object_angle_bracket(Text *txt, size_t pos) {
 	return text_object_bracket(txt, pos, '>');
 }
 
-Filerange text_object_paranthese(Text *txt, size_t pos) {
+Filerange text_object_parenthesis(Text *txt, size_t pos) {
 	return text_object_bracket(txt, pos, ')');
 }
 
diff --git a/text-objects.h b/text-objects.h
@@ -36,7 +36,7 @@ Filerange text_object_paragraph_outer(Text*, size_t pos);
 Filerange text_object_square_bracket(Text*, size_t pos);
 Filerange text_object_curly_bracket(Text*, size_t pos);
 Filerange text_object_angle_bracket(Text*, size_t pos);
-Filerange text_object_paranthese(Text*, size_t pos);
+Filerange text_object_parenthesis(Text*, size_t pos);
 Filerange text_object_quote(Text*, size_t pos);
 Filerange text_object_single_quote(Text*, size_t pos);
 Filerange text_object_backtick(Text*, size_t pos);
diff --git a/vis-text-objects.c b/vis-text-objects.c
@@ -141,12 +141,12 @@ const TextObject vis_textobjects[] = {
 		.txt = text_object_angle_bracket,
 		.type = TEXTOBJECT_DELIMITED_INNER,
 	},
-	[VIS_TEXTOBJECT_OUTER_PARANTHESE] = {
-		.txt = text_object_paranthese,
+	[VIS_TEXTOBJECT_OUTER_PARENTHESIS] = {
+		.txt = text_object_parenthesis,
 		.type = TEXTOBJECT_DELIMITED_OUTER,
 	},
-	[VIS_TEXTOBJECT_INNER_PARANTHESE] = {
-		.txt = text_object_paranthese,
+	[VIS_TEXTOBJECT_INNER_PARENTHESIS] = {
+		.txt = text_object_parenthesis,
 		.type = TEXTOBJECT_DELIMITED_INNER,
 	},
 	[VIS_TEXTOBJECT_OUTER_QUOTE] = {
diff --git a/vis.h b/vis.h
@@ -617,8 +617,8 @@ enum VisTextObject {
 	VIS_TEXTOBJECT_INNER_CURLY_BRACKET,
 	VIS_TEXTOBJECT_OUTER_ANGLE_BRACKET,
 	VIS_TEXTOBJECT_INNER_ANGLE_BRACKET,
-	VIS_TEXTOBJECT_OUTER_PARANTHESE,
-	VIS_TEXTOBJECT_INNER_PARANTHESE,
+	VIS_TEXTOBJECT_OUTER_PARENTHESIS,
+	VIS_TEXTOBJECT_INNER_PARENTHESIS,
 	VIS_TEXTOBJECT_OUTER_QUOTE,
 	VIS_TEXTOBJECT_INNER_QUOTE,
 	VIS_TEXTOBJECT_OUTER_SINGLE_QUOTE,