Merge branch 'zj/decimal-width'

* zj/decimal-width:
  make lineno_width() from blame reusable for others

Conflicts:
	cache.h
	pager.c

diff --cc builtin/blame.c
Simple merge

diff --cc cache.h
index 3a8e1258e7a15e5ffba52ad400d9ae23cedb0982,24732e6caf8ba30b44a5aa5f40eb5756d164daf4..422c5cfcb374259b46a7f92fc2a08b726f54f77a
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -1177,7 -1176,7 +1177,8 @@@ 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;
  extern const char *askpass_program;

diff --cc pager.c
index b7909678f459d90d1c8907c78bb5fcb512fe558d,96c07babbd7756a59fb5e891bf78f9c4396fed13..05584dead6728ceff818630fbccaa91bb6c6b686
--- 1/pager.c
--- 2/pager.c
+++ b/pager.c
@@@ -117,33 -111,14 +117,45 @@@ int pager_in_use(void
        return env ? git_config_bool("GIT_PAGER_IN_USE", env) : 0;
  }
  
 +/*
 + * Return cached value (if set) or $COLUMNS environment variable (if
 + * set and positive) or ioctl(1, TIOCGWINSZ).ws_col (if positive),
 + * and default to 80 if all else fails.
 + */
 +int term_columns(void)
 +{
 +      static int term_columns_at_startup;
 +
 +      char *col_string;
 +      int n_cols;
 +
 +      if (term_columns_at_startup)
 +              return term_columns_at_startup;
 +
 +      term_columns_at_startup = 80;
 +
 +      col_string = getenv("COLUMNS");
 +      if (col_string && (n_cols = atoi(col_string)) > 0)
 +              term_columns_at_startup = n_cols;
 +#ifdef TIOCGWINSZ
 +      else {
 +              struct winsize ws;
 +              if (!ioctl(1, TIOCGWINSZ, &ws) && ws.ws_col)
 +                      term_columns_at_startup = ws.ws_col;
 +      }
 +#endif
 +
 +      return term_columns_at_startup;
 +}
++
+ /*
+  * How many columns do we need to show this number in decimal?
+  */
+ int decimal_width(int number)
+ {
+       int i, width;
+ 
+       for (width = 1, i = 10; i <= number; width++)
+               i *= 10;
+       return width;
+ }