summaryrefslogtreecommitdiff
path: root/usr.bin/less/opttbl.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2014-04-29 12:11:26 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2014-04-29 12:11:26 +0000
commit7751e0ec1e580c7e56c70dbbe99508fdd63f8488 (patch)
tree43a95635e429986a2a58fc9048a61e8d52e8264f /usr.bin/less/opttbl.c
parentda56150082fce6201d87c88d1d6236b29aa3575b (diff)
Remove support for the obsolete (non-POSIX) "more -d" prompt.
This was a local change that was only enabled when the LESS_IS_MORE environment variable was set and not when invoked as "more". OK shadchin@ jmc@
Diffstat (limited to 'usr.bin/less/opttbl.c')
-rw-r--r--usr.bin/less/opttbl.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/usr.bin/less/opttbl.c b/usr.bin/less/opttbl.c
index f36c42e9a3a..9671d47196e 100644
--- a/usr.bin/less/opttbl.c
+++ b/usr.bin/less/opttbl.c
@@ -28,7 +28,6 @@ public int know_dumb; /* Don't complain about dumb terminals */
public int quit_at_eof; /* Quit after hitting end of file twice */
public int quit_if_one_screen; /* Quit if EOF on first screen */
public int squeeze; /* Squeeze multiple blank lines into one */
-public int be_helpful; /* more(1) style -d */
public int tabstop; /* Tab settings */
public int back_scroll; /* Repaint screen on backwards movement */
public int forw_scroll; /* Repaint screen on forward movement */
@@ -536,21 +535,6 @@ init_option()
for (o = option; o->oletter != '\0'; o++)
{
/*
- * Replace less's -d option if invoked as more
- */
- if (less_is_more && o->oletter == 'd')
- {
- o->onames = NULL;
- o->otype = BOOL;
- o->odefault = OPT_OFF;
- o->ovar = &be_helpful;
- o->ofunc = NULL;
- o->odesc[0] = "Be less helpful in prompts";
- o->odesc[1] = "Be helpful in prompts";
- o->odesc[2] = NULL;
- }
-
- /*
* Set each variable to its default.
*/
if (o->ovar != NULL)