Merge branch 'maint'

* maint:
  Fix typo in show-index.c
  pager: default to LESS=FRS
This commit is contained in:
Junio C Hamano 2006-10-20 16:51:05 -07:00
commit 7a6a5e4062
2 changed files with 2 additions and 2 deletions

View File

@ -50,7 +50,7 @@ void setup_pager(void)
close(fd[0]); close(fd[0]);
close(fd[1]); close(fd[1]);
setenv("LESS", "-RS", 0); setenv("LESS", "FRS", 0);
run_pager(pager); run_pager(pager);
die("unable to execute pager '%s'", pager); die("unable to execute pager '%s'", pager);
exit(255); exit(255);

View File

@ -8,7 +8,7 @@ int main(int argc, char **argv)
static unsigned int top_index[256]; static unsigned int top_index[256];
if (fread(top_index, sizeof(top_index), 1, stdin) != 1) if (fread(top_index, sizeof(top_index), 1, stdin) != 1)
die("unable to read idex"); die("unable to read index");
nr = 0; nr = 0;
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
unsigned n = ntohl(top_index[i]); unsigned n = ntohl(top_index[i]);