diff options
author | delphij <delphij@FreeBSD.org> | 2007-06-04 01:43:11 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2007-06-04 01:43:11 +0000 |
commit | 2908bdb1f10f819d2713971e094aa9719b317184 (patch) | |
tree | 81e259b4b8551856ddf7763cc779172378fe60dc /contrib/less/prompt.c | |
parent | 9b5d103b5b51a6fea5caf2c8b1fc678d65a357c9 (diff) | |
download | FreeBSD-src-2908bdb1f10f819d2713971e094aa9719b317184.zip FreeBSD-src-2908bdb1f10f819d2713971e094aa9719b317184.tar.gz |
Resolve conflicts.
Diffstat (limited to 'contrib/less/prompt.c')
-rw-r--r-- | contrib/less/prompt.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/contrib/less/prompt.c b/contrib/less/prompt.c index 7e22f99..4f96895 100644 --- a/contrib/less/prompt.c +++ b/contrib/less/prompt.c @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /* - * Copyright (C) 1984-2004 Mark Nudelman + * Copyright (C) 1984-2007 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -31,6 +31,7 @@ extern int linenums; extern int hshift; extern int sc_height; extern int jump_sline; +extern int less_is_more; extern IFILE curr_ifile; #if EDITOR extern char *editor; @@ -53,6 +54,8 @@ static constant char h_proto[] = "HELP -- ?eEND -- Press g to see it again:Press RETURN for more., or q when done"; static constant char w_proto[] = "Waiting for data"; +static constant char more_proto[] = + "--More--(?eEND ?x- Next\\: %x.:?pB%pB\\%:byte %bB?s/%s...%t)"; public char *prproto[3]; public char constant *eqproto = e_proto; @@ -69,7 +72,7 @@ static char *mp; init_prompt() { prproto[0] = save(s_proto); - prproto[1] = save(m_proto); + prproto[1] = save(less_is_more ? more_proto : m_proto); prproto[2] = save(M_proto); eqproto = save(e_proto); hproto = save(h_proto); @@ -562,9 +565,11 @@ eq_message() pr_string() { char *prompt; + int type; + type = (!less_is_more) ? pr_type : pr_type ? 0 : 1; prompt = pr_expand((ch_getflags() & CH_HELPFILE) ? - hproto : prproto[pr_type], + hproto : prproto[type], sc_width-so_s_width-so_e_width-2); new_file = 0; return (prompt); |