aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--syntax.h18
-rw-r--r--ui-curses.h1
-rw-r--r--view.c15
-rw-r--r--view.h1
-rw-r--r--vis.h1
5 files changed, 14 insertions, 22 deletions
diff --git a/syntax.h b/syntax.h
deleted file mode 100644
index 35be024..0000000
--- a/syntax.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef SYNTAX_H
-#define SYNTAX_H
-
-typedef struct {
- char *symbol;
- int style;
-} SyntaxSymbol;
-
-enum {
- SYNTAX_SYMBOL_SPACE,
- SYNTAX_SYMBOL_TAB,
- SYNTAX_SYMBOL_TAB_FILL,
- SYNTAX_SYMBOL_EOL,
- SYNTAX_SYMBOL_EOF,
- SYNTAX_SYMBOL_LAST,
-};
-
-#endif
diff --git a/ui-curses.h b/ui-curses.h
index d23f8c3..34897ee 100644
--- a/ui-curses.h
+++ b/ui-curses.h
@@ -3,7 +3,6 @@
#include <curses.h>
#include "ui.h"
-#include "syntax.h"
Ui *ui_curses_new(void);
void ui_curses_free(Ui*);
diff --git a/view.c b/view.c
index 2335a2a..bf6fca6 100644
--- a/view.c
+++ b/view.c
@@ -21,12 +21,25 @@
#include <regex.h>
#include "vis.h"
#include "view.h"
-#include "syntax.h"
#include "text.h"
#include "text-motions.h"
#include "text-util.h"
#include "util.h"
+typedef struct {
+ char *symbol;
+ int style;
+} SyntaxSymbol;
+
+enum {
+ SYNTAX_SYMBOL_SPACE,
+ SYNTAX_SYMBOL_TAB,
+ SYNTAX_SYMBOL_TAB_FILL,
+ SYNTAX_SYMBOL_EOL,
+ SYNTAX_SYMBOL_EOF,
+ SYNTAX_SYMBOL_LAST,
+};
+
struct Selection {
Mark anchor; /* position where the selection was created */
Mark cursor; /* other selection endpoint where it changes */
diff --git a/view.h b/view.h
index f763a21..5513dcf 100644
--- a/view.h
+++ b/view.h
@@ -7,7 +7,6 @@
#include "register.h"
#include "text.h"
#include "ui.h"
-#include "syntax.h"
typedef struct View View;
typedef struct Cursor Cursor;
diff --git a/vis.h b/vis.h
index 0561f65..80b3f3b 100644
--- a/vis.h
+++ b/vis.h
@@ -12,7 +12,6 @@ typedef struct Win Win;
#include "ui.h"
#include "view.h"
#include "register.h"
-#include "syntax.h"
typedef union { /* various types of arguments passed to key action functions */
bool b;