Merge branch 'maint'

* maint:
Fix typo in show-index.c
pager: default to LESS=FRS

diff --git a/pager.c b/pager.c
index dcb398da8e703de2999badb976dee7322eff470b..8bd33a15ca50f01b3c5a5e4028dc0b64d5360a92 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -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);

diff --git a/show-index.c b/show-index.c
index c21d660b628a5b6d67b0f56b41fc76a921df340f..a30a2de5d13931c590169cf30bd7004e23f2df1b 100644 (file)
--- a/show-index.c
+++ b/show-index.c
@@ -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]);