remove -p (terse prompts)

SCCS-vsn: usr.bin/more/option.c 5.8
SCCS-vsn: usr.bin/more/more.1 5.9

diff --git a/usr/src/usr.bin/more/more.1 b/usr/src/usr.bin/more/more.1
index 731968c..039f537 100644 (file)
--- a/usr/src/usr.bin/more/more.1
+++ b/usr/src/usr.bin/more/more.1
@@ -16,13 +16,13 @@
 .\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"

-.\"    @(#)more.1      5.8 (Berkeley) %G%
+.\"    @(#)more.1      5.9 (Berkeley) %G%

 .\"
 .TH MORE 1
 .SH NAME
 more \- file perusal filter for crt viewing
 .SH SYNOPSIS
 .\"
 .TH MORE 1
 .SH NAME
 more \- file perusal filter for crt viewing
 .SH SYNOPSIS

-.B "more [-ceinpus] [-t tag] [-x tabs] [-/ pattern] [-#] [file ...]"
+.B "more [-ceinus] [-t tag] [-x tabs] [-/ pattern] [-#] [file ...]"

 .SH DESCRIPTION
 .I More
 is a filter for paging through text one screenful at a time.  It
 .SH DESCRIPTION
 .I More
 is a filter for paging through text one screenful at a time.  It


@@ -61,9 +61,6 @@ to run more slowly in some cases, especially with a very large input file.
 Suppressing line numbers with the -n flag will avoid this problem.
 Using line numbers means: the line number will be displayed in the 
 = command, and the v command will pass the current line number to the editor.
 Suppressing line numbers with the -n flag will avoid this problem.
 Using line numbers means: the line number will be displayed in the 
 = command, and the v command will pass the current line number to the editor.

-.IP -p
-The -p option gives you a colon (``:'') for a prompt, rather than
-the more verbose traditional prompt.

 .IP -s
 The -s option causes
 consecutive blank lines to be squeezed into a single blank line.
 .IP -s
 The -s option causes
 consecutive blank lines to be squeezed into a single blank line.

diff --git a/usr/src/usr.bin/more/option.c b/usr/src/usr.bin/more/option.c
index 9e12be2..2412840 100644 (file)
--- a/usr/src/usr.bin/more/option.c
+++ b/usr/src/usr.bin/more/option.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)option.c   5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)option.c   5.8 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>


@@ -33,7 +33,6 @@ int quit_at_eof;
 int squeeze;                   /* Squeeze multiple blank lines into one */
 int tabstop = 8;               /* Tab settings */
 int tagoption;
 int squeeze;                   /* Squeeze multiple blank lines into one */
 int tabstop = 8;               /* Tab settings */
 int tagoption;

-int terseprompt;

 
 char *firstsearch;
 extern int sc_height;
 
 char *firstsearch;
 extern int sc_height;


@@ -55,7 +54,7 @@ option(argc, argv)
                        (*a)[0] = '-';
 
        optind = 1;             /* called twice, re-init getopt. */
                        (*a)[0] = '-';
 
        optind = 1;             /* called twice, re-init getopt. */

-       while ((ch = getopt(argc, argv, "0123456789/:ceinpst:ux:")) != EOF)
+       while ((ch = getopt(argc, argv, "0123456789/:ceinst:ux:")) != EOF)

                switch((char)ch) {
                case '0': case '1': case '2': case '3': case '4':
                case '5': case '6': case '7': case '8': case '9':
                switch((char)ch) {
                case '0': case '1': case '2': case '3': case '4':
                case '5': case '6': case '7': case '8': case '9':


@@ -87,9 +86,6 @@ option(argc, argv)
                case 'n':
                        linenums = 0;
                        break;
                case 'n':
                        linenums = 0;
                        break;

-               case 'p':
-                       terseprompt = 1;
-                       break;

                case 's':
                        squeeze = 1;
                        break;
                case 's':
                        squeeze = 1;
                        break;


@@ -108,7 +104,7 @@ option(argc, argv)
                case '?':
                default:
                        fprintf(stderr,
                case '?':
                default:
                        fprintf(stderr,

-                           "usage: less [-ceinpus] [-t tag] [-x tabs] [-/ pattern] [-#] [file ...]\n");
+                           "usage: less [-ceinus] [-t tag] [-x tabs] [-/ pattern] [-#] [file ...]\n");

                        exit(1);
                }
        return(optind);
                        exit(1);
                }
        return(optind);