Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler

diff --git a/cache.h b/cache.h
index 24732e6caf8ba30b44a5aa5f40eb5756d164daf4..deaa35a70011123c6a8061cedabf6d368b925a5b 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1176,6 +1176,7 @@ extern void setup_pager(void);
 extern const char *pager_program;
 extern int pager_in_use(void);
 extern int pager_use_color;
+extern int term_columns(void);
 extern int decimal_width(int);
 
 extern const char *editor_program;