Merge branch 'ja/i18n-fix'

diff --git a/column.c b/column.c
index ded50337f7a52bd237509114c0c330de34f3525a..2165297608ec92c3f5a9cc9abfba072f9d43be1f 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) : \
@@ -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));
        }
 }