summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2012-03-27 06:22:46 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2012-03-27 06:22:46 +0000
commit788d032942801f767dfd403d9165cd3f3f3f62ea (patch)
tree767a9e9a8fc907dba21d5fcaebe5cd1ef83fca3f
parent0bb312a7f0d39bcc9334f926b048402eac71d3f7 (diff)
Reverse the default of the -c flag from off to on to prevent the text
being displayed in the wrong place initially and then jumping when first redrawn (such as when searching). ok deraadt sthen
-rw-r--r--usr.bin/less/less.112
-rw-r--r--usr.bin/less/main.c1
-rw-r--r--usr.bin/less/opttbl.c2
3 files changed, 10 insertions, 5 deletions
diff --git a/usr.bin/less/less.1 b/usr.bin/less/less.1
index 3dd330ef98f..29ebdb5531c 100644
--- a/usr.bin/less/less.1
+++ b/usr.bin/less/less.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: less.1,v 1.25 2011/11/15 23:02:44 nicm Exp $
+.\" $OpenBSD: less.1,v 1.26 2012/03/27 06:22:45 nicm Exp $
.\"
.\" Copyright (C) 1984-2011 Mark Nudelman
.\"
@@ -23,7 +23,7 @@
.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: November 15 2011 $
+.Dd $Mdocdate: March 27 2012 $
.Dt LESS 1
.Os
.Sh NAME
@@ -575,8 +575,12 @@ Same as -c, for compatibility with older versions of
.Nm less .
.It Fl c | -clear-screen
Causes full screen repaints to be painted from the top line down.
-By default,
-full screen repaints are done by scrolling from the bottom of the screen.
+If off, full screen repaints are done by scrolling from the bottom of the
+screen.
+On
+.Ox
+this option is on by default to avoid the position of the display being moved
+when using interactive commands.
.It Fl d | -dumb No (less only)
The -d option suppresses the error message
normally displayed if the terminal is dumb;
diff --git a/usr.bin/less/main.c b/usr.bin/less/main.c
index 4e26aaeefd1..082a7680f9a 100644
--- a/usr.bin/less/main.c
+++ b/usr.bin/less/main.c
@@ -138,6 +138,7 @@ main(argc, argv)
scan_option("-G");
scan_option("-L");
scan_option("-X");
+ scan_option("-c");
}
s = lgetenv(less_is_more ? "MORE" : "LESS");
diff --git a/usr.bin/less/opttbl.c b/usr.bin/less/opttbl.c
index d79e136db89..30f8fdd0bce 100644
--- a/usr.bin/less/opttbl.c
+++ b/usr.bin/less/opttbl.c
@@ -217,7 +217,7 @@ static struct loption option[] =
}
},
{ 'c', &c_optname,
- TRIPLE, OPT_OFF, &top_scroll, NULL,
+ TRIPLE, OPT_ON, &top_scroll, NULL,
{
"Repaint by scrolling from bottom of screen",
"Repaint by painting from top of screen",