From 21062d74d5373699aad9fe8d77bd5312a33e9834 Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 17 Sep 2014 15:31:38 +0000 Subject: [PATCH] Fix some comments (c -> colour) and join unnecessary line splits. --- grid.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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]; }