Merge branch 'dl/complete-cherry-pick-revert-skip'

diff --git a/column.c b/column.c
index ded50337f7a52bd237509114c0c330de34f3525a..7a17c14b822faac1a00b62412611825f0952a935 100644 (file)
--- a/column.c
+++ b/column.c
@@ -5,7 +5,6 @@
 #include "parse-options.h"
 #include "run-command.h"
 #include "utf8.h"
-#include "pager.c"
 
 #define XY2LINEAR(d, x, y) (COL_LAYOUT((d)->colopts) == COL_COLUMN ? \
                            (x) * (d)->rows + (y) : \
@@ -22,7 +21,7 @@ struct column_data {
 };
 
 /* return length of 's' in letters, ANSI escapes stripped */
-static int item_length(unsigned int colopts, const char *s)
+static int item_length(const char *s)
 {
        int len, i = 0;
        struct strbuf str = STRBUF_INIT;
@@ -168,7 +167,7 @@ static void display_table(const struct string_list *list,
 
        ALLOC_ARRAY(data.len, list->nr);
        for (i = 0; i < list->nr; i++)
-               data.len[i] = item_length(colopts, list->items[i].string);
+               data.len[i] = item_length(list->items[i].string);
 
        layout(&data, &initial_width);
 
@@ -215,7 +214,7 @@ void print_columns(const struct string_list *list, unsigned int colopts,
                display_table(list, colopts, &nopts);
                break;
        default:
-               die("BUG: invalid layout mode %d", COL_LAYOUT(colopts));
+               BUG("invalid layout mode %d", COL_LAYOUT(colopts));
        }
 }