vis

commit bd18445b5627e65cfd36dba239e6422618f754b0
parent 46a7ef90041fd54c538d856d8e60e721035f11d5
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Fri, 20 May 2016 13:16:09 +0200

ui: s/UiStyles/UiStyle/g

Diffstat:
M
ui-curses.c
 | 
2
+-
M
ui.h
 | 
2
+-
M
view.c
 | 
2
+-
M
view.h
 | 
2
+-

4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ui-curses.c b/ui-curses.c
@@ -696,7 +696,7 @@ static void ui_window_draw(UiWin *w) {
 	for (const Line *l = view_lines_get(win->view); l; l = l->next) {
 		bool cursor_line = l->lineno == cursor_lineno;
 		for (int x = 0; x < width; x++) {
-			enum UiStyles style_id = l->cells[x].style;
+			enum UiStyle style_id = l->cells[x].style;
 			if (style_id == 0)
 				style_id = UI_STYLE_DEFAULT;
 			CellStyle *style = &win->styles[style_id];
diff --git a/ui.h b/ui.h
@@ -33,7 +33,7 @@ enum UiOption {
 	UI_OPTION_LARGE_FILE = 1 << 10,
 };
 
-enum UiStyles {
+enum UiStyle {
 	UI_STYLE_LEXER_MAX = 64,
 	UI_STYLE_DEFAULT,
 	UI_STYLE_CURSOR,
diff --git a/view.c b/view.c
@@ -225,7 +225,7 @@ bool view_syntax_set(View *view, const char *name) {
 	lua_getfield(L, -1, "lexers");
 
 	static const struct {
-		enum UiStyles id;
+		enum UiStyle id;
 		const char *name;
 	} styles[] = {
 		{ UI_STYLE_DEFAULT,        "STYLE_DEFAULT"        },
diff --git a/view.h b/view.h
@@ -25,7 +25,7 @@ typedef struct {
 	char data[16];      /* utf8 encoded character displayed in this cell (might be more than
 	                       one Unicode codepoint. might also not be the same as in the
 	                       underlying text, for example tabs get expanded */
-	enum UiStyles style;/* style id used to display this cell */
+	enum UiStyle style; /* style id used to display this cell */
 	bool selected;      /* whether this cell is part of a selected region */
 	bool cursor;        /* whether a cursor is currently located on the cell */
 	bool cursor_primary;/* whether it is the primary cursor located on the cell */