From 4e956d545a52fe6b8310cfb30a26a89976d55cd9 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 1 Sep 2014 21:50:18 +0000
Subject: Various minor style and spacing nits.

---
 grid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'grid.c')

diff --git a/grid.c b/grid.c
index 28210185..784ff72f 100644
--- a/grid.c
+++ b/grid.c
@@ -572,7 +572,7 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx,
 	const struct grid_cell	*gc;
 	static struct grid_cell	 lastgc1;
 	struct utf8_data	 ud;
-	const char*		 data;
+	const char		*data;
 	char			*buf, code[128];
 	size_t			 len, off, size, codelen;
 	u_int			 xx;
-- 
cgit 


From 21062d74d5373699aad9fe8d77bd5312a33e9834 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 17 Sep 2014 15:31:38 +0000
Subject: Fix some comments (c -> colour) and join unnecessary line splits.

---
 grid.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'grid.c')

diff --git a/grid.c b/grid.c
index 784ff72f..afb0e041 100644
--- a/grid.c
+++ b/grid.c
@@ -514,20 +514,18 @@ grid_string_cells_code(const struct grid_cell *lastgc,
 			s[n++] = attrs[i].code;
 	}
 
-	/* If the foreground c changed, append its parameters. */
+	/* If the foreground colour changed, append its parameters. */
 	nnewc = grid_string_cells_fg(gc, newc);
 	noldc = grid_string_cells_fg(lastgc, oldc);
-	if (nnewc != noldc ||
-	    memcmp(newc,oldc, nnewc * sizeof newc[0]) != 0) {
+	if (nnewc != noldc || memcmp(newc, oldc, nnewc * sizeof newc[0]) != 0) {
 		for (i = 0; i < nnewc; i++)
 			s[n++] = newc[i];
 	}
 
-	/* If the background c changed, append its parameters. */
+	/* If the background colour changed, append its parameters. */
 	nnewc = grid_string_cells_bg(gc, newc);
 	noldc = grid_string_cells_bg(lastgc, oldc);
-	if (nnewc != noldc ||
-	    memcmp(newc, oldc, nnewc * sizeof newc[0]) != 0) {
+	if (nnewc != noldc || memcmp(newc, oldc, nnewc * sizeof newc[0]) != 0) {
 		for (i = 0; i < nnewc; i++)
 			s[n++] = newc[i];
 	}
-- 
cgit