vis

commit b2b51c8a65cdf04d505fe185193898063a3ec1ff
parent f6accbf15d175edcc5794bf316eac6dc9e5c1edc
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Tue, 12 Apr 2016 10:00:47 +0200

Merge branch 'fixups' of https://github.com/tycho/vis

Diffstat:
M
sam.c
 | 
4
++--
M
text-motions.c
 | 
10
+++++-----
M
text-motions.h
 | 
2
+-
M
text-objects.c
 | 
4
++--

4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/sam.c b/sam.c
@@ -1080,13 +1080,13 @@ static bool cmd_filter(Vis *vis, Win *win, Command *cmd, const char *argv[], Cur
 	/* The general idea is the following:
 	 *
 	 *  1) take a snapshot
-	 *  2) write [range.start, range.end] to exteneral command
+	 *  2) write [range.start, range.end] to external command
 	 *  3) read the output of the external command and insert it after the range
 	 *  4) depending on the exit status of the external command
 	 *     - on success: delete original range
 	 *     - on failure: revert to previous snapshot
 	 *
-	 *  2) and 3) happend in small junks
+	 *  2) and 3) happen in small chunks
 	 */
 
 	text_snapshot(txt);
diff --git a/text-motions.c b/text-motions.c
@@ -11,7 +11,7 @@
 #define boundary(c) (isboundary((unsigned char)c))
 
 // TODO: specify this per file type?
-int is_word_boundry(int c) {
+int is_word_boundary(int c) {
 	return ISASCII(c) && !(('0' <= c && c <= '9') ||
 	         ('a' <= c && c <= 'z') ||
 	         ('A' <= c && c <= 'Z') || c == '_');
@@ -405,19 +405,19 @@ size_t text_longword_start_prev(Text *txt, size_t pos) {
 }
 
 size_t text_word_end_next(Text *txt, size_t pos) {
-	return text_customword_end_next(txt, pos, is_word_boundry);
+	return text_customword_end_next(txt, pos, is_word_boundary);
 }
 
 size_t text_word_end_prev(Text *txt, size_t pos) {
-	return text_customword_end_prev(txt, pos, is_word_boundry);
+	return text_customword_end_prev(txt, pos, is_word_boundary);
 }
 
 size_t text_word_start_next(Text *txt, size_t pos) {
-	return text_customword_start_next(txt, pos, is_word_boundry);
+	return text_customword_start_next(txt, pos, is_word_boundary);
 }
 
 size_t text_word_start_prev(Text *txt, size_t pos) {
-	return text_customword_start_prev(txt, pos, is_word_boundry);
+	return text_customword_start_prev(txt, pos, is_word_boundary);
 }
 
 size_t text_sentence_next(Text *txt, size_t pos) {
diff --git a/text-motions.h b/text-motions.h
@@ -123,6 +123,6 @@ size_t text_search_forward(Text *txt, size_t pos, Regex *regex);
 size_t text_search_backward(Text *txt, size_t pos, Regex *regex);
 
 /* is c a special symbol delimiting a word? */
-int is_word_boundry(int c);
+int is_word_boundary(int c);
 
 #endif
diff --git a/text-objects.c b/text-objects.c
@@ -66,7 +66,7 @@ static Filerange text_object_customword(Text *txt, size_t pos, int (*isboundary)
 }
 
 Filerange text_object_word(Text *txt, size_t pos) {
-	return text_object_customword(txt, pos, is_word_boundry);
+	return text_object_customword(txt, pos, is_word_boundary);
 }
 
 Filerange text_object_longword(Text *txt, size_t pos) {
@@ -117,7 +117,7 @@ Filerange text_object_longword_outer(Text *txt, size_t pos) {
 }
 
 Filerange text_object_word_outer(Text *txt, size_t pos) {
-	return text_object_customword_outer(txt, pos, is_word_boundry);
+	return text_object_customword_outer(txt, pos, is_word_boundary);
 }
 
 Filerange text_object_word_find_next(Text *txt, size_t pos, const char *word) {