Browse Source

Merge branch 'maint'

* maint:
  Fix typo in show-index.c
  pager: default to LESS=FRS
maint
Junio C Hamano 18 years ago
parent
commit
7a6a5e4062
  1. 2
      pager.c
  2. 2
      show-index.c

2
pager.c

@ -50,7 +50,7 @@ void setup_pager(void) @@ -50,7 +50,7 @@ void setup_pager(void)
close(fd[0]);
close(fd[1]);

setenv("LESS", "-RS", 0);
setenv("LESS", "FRS", 0);
run_pager(pager);
die("unable to execute pager '%s'", pager);
exit(255);

2
show-index.c

@ -8,7 +8,7 @@ int main(int argc, char **argv) @@ -8,7 +8,7 @@ int main(int argc, char **argv)
static unsigned int top_index[256];

if (fread(top_index, sizeof(top_index), 1, stdin) != 1)
die("unable to read idex");
die("unable to read index");
nr = 0;
for (i = 0; i < 256; i++) {
unsigned n = ntohl(top_index[i]);

Loading…
Cancel
Save