Merge in less 444 plus local changes

ok nicm@

1 files changed, 6 insertions, 9 deletions

diff --git a/usr.bin/less/lesskey.1 b/usr.bin/less/lesskey.1
index 242b799b2fe..1d2e9837a92 100644
--- a/usr.bin/less/lesskey.1
+++ b/usr.bin/less/lesskey.1
@@ -1,6 +1,6 @@
-.\"	$OpenBSD: lesskey.1,v 1.8 2007/05/31 19:20:12 jmc Exp $
+.\"	$OpenBSD: lesskey.1,v 1.9 2011/09/16 18:12:09 shadchin Exp $
 .\"
-.\" Copyright (C) 2000  Mark Nudelman
+.\" Copyright (C) 2000-2011  Mark Nudelman
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,7 +22,7 @@
 .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 16 2011 $
 .Dt LESSKEY 1
 .Os
 .Sh NAME
@@ -274,6 +274,7 @@ n	repeat-search
 \een	repeat-search-all
 N	reverse-search
 \eeN	reverse-search-all
+&	filter
 m	set-mark
 \'	goto-mark
 ^X^X	goto-mark
@@ -387,6 +388,7 @@ default line-editing keys used by less:
 \eek	up
 \eku	up
 \eej	down
+^G	abort
 .Ed
 .Sh ENVIRONMENT SECTION
 The environment variable section begins with the line
@@ -448,12 +450,7 @@ file.
 .Pp
 Send bug reports or comments to the above address or to
 .Aq bug\-less@gnu.org .
-.Sh CAVEATS
-It is not possible to specify special keys, such as uparrow,
-in a keyboard-independent manner.
-The only way to specify such keys is to specify the escape sequence
-which a particular keyboard sends when such a key is pressed.
-.\" .Pp
+.\" .Sh CAVEATS
 .\" On MS-DOS and OS/2 systems, certain keys send a sequence of characters
 .\" which start with a NUL character (0).
 .\" This NUL character should be represented as \e340 in a lesskey file.