From 994cb872cfb5ef49a08a714d093d92bfee79b0e8 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 9 Jan 2014 13:58:06 +0000
Subject: Style and comment fixes from Tiago Cunha.

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

(limited to 'grid.c')

diff --git a/grid.c b/grid.c
index d06e7154..d9b3c716 100644
--- a/grid.c
+++ b/grid.c
@@ -644,7 +644,7 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx,
         if (trim) {
 		while (off > 0 && buf[off - 1] == ' ')
 			off--;
-        }
+	}
 	buf[off] = '\0';
 
 	return (buf);
-- 
cgit 


From 3368b602a868eb6570c4ee92f45c2e0ee78631cb Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 15 Jan 2014 11:44:18 +0000
Subject: Couple of fixes from cppcheck via Tiago Cunha.

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

(limited to 'grid.c')

diff --git a/grid.c b/grid.c
index d9b3c716..852423b5 100644
--- a/grid.c
+++ b/grid.c
@@ -124,7 +124,7 @@ grid_compare(struct grid *ga, struct grid *gb)
 	struct grid_cell	*gca, *gcb;
 	u_int			 xx, yy;
 
-	if (ga->sx != gb->sx || ga->sy != ga->sy)
+	if (ga->sx != gb->sx || ga->sy != gb->sy)
 		return (1);
 
 	for (yy = 0; yy < ga->sy; yy++) {
-- 
cgit 


From 945339b443affdaaca260605e15b5a3b9a3c6e16 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 28 Jan 2014 23:07:09 +0000
Subject: Allow replacing each of the many sets of separate foo-{fg,bg,attr}
 options with a single foo-style option. For example:

    set -g status-fg yellow
    set -g status-bg red
    set -g status-attr blink

Becomes:

    set -g status-style fg=yellow,bg=red,blink

The -a flag to set can be used to add to rather than replace a style. So:

    set -g status-bg red

Becomes:

    set -ag status-style bg=red

Currently this is fully backwards compatible (all *-{fg,bg,attr} options
remain) but the plan is to deprecate them over time.

From Tiago Cunha.
---
 grid.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'grid.c')

diff --git a/grid.c b/grid.c
index 852423b5..fb838adf 100644
--- a/grid.c
+++ b/grid.c
@@ -37,7 +37,6 @@
 
 /* Default grid cell data. */
 const struct grid_cell grid_default_cell = { 0, 0, 8, 8, (1 << 4) | 1, " " };
-const struct grid_cell grid_marker_cell = { 0, 0, 8, 8, (1 << 4) | 1, "_" };
 
 #define grid_put_cell(gd, px, py, gc) do {			\
 	memcpy(&gd->linedata[py].celldata[px], 			\
-- 
cgit