MFV: less v451.

60 files changed, 442 insertions, 419 deletions

diff --git a/contrib/less/NEWS b/contrib/less/NEWS
index 9a8ea26..e0979cf 100644
--- a/contrib/less/NEWS
+++ b/contrib/less/NEWS
@@ -11,7 +11,7 @@
 
 ======================================================================
 
-	Major changes between "less" versions 444 and 449
+	Major changes between "less" versions 444 and 451
 
 * Add ESC-F command to keep reading data until a pattern is found.
 
diff --git a/contrib/less/README b/contrib/less/README
index e00ce82..1f57f7d 100644
--- a/contrib/less/README
+++ b/contrib/less/README
@@ -7,9 +7,9 @@
 **************************************************************************
 **************************************************************************
 
-                            Less, version 449
+                            Less, version 451
 
-    This is the distribution of less, version 449, released 26 Jun 2012.
+    This is the distribution of less, version 451, released 21 Jul 2012.
     This program is part of the GNU project (http://www.gnu.org).
 
     This program is free software.  You may redistribute it and/or
diff --git a/contrib/less/brac.c b/contrib/less/brac.c
index fcf9ed2..70a7771 100644
--- a/contrib/less/brac.c
+++ b/contrib/less/brac.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/ch.c b/contrib/less/ch.c
index 8e431df..2e2ded7 100644
--- a/contrib/less/ch.c
+++ b/contrib/less/ch.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
@@ -807,6 +807,17 @@ seekable(f)
 }
 
 /*
+ * Force EOF to be at the current read position.
+ * This is used after an ignore_eof read, during which the EOF may change.
+ */
+	public void
+ch_set_eof()
+{
+	ch_fsize = ch_fpos;
+}
+
+
+/*
  * Initialize file state for a new file.
  */
 	public void
diff --git a/contrib/less/charset.c b/contrib/less/charset.c
index 4ce6a54..03b38e0 100644
--- a/contrib/less/charset.c
+++ b/contrib/less/charset.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/charset.h b/contrib/less/charset.h
index 0ae6366..7df4df6 100644
--- a/contrib/less/charset.h
+++ b/contrib/less/charset.h
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 #define IS_ASCII_OCTET(c)   (((c) & 0x80) == 0)
 #define IS_UTF8_TRAIL(c)    (((c) & 0xC0) == 0x80)
diff --git a/contrib/less/cmd.h b/contrib/less/cmd.h
index 627f85b..9a72160 100644
--- a/contrib/less/cmd.h
+++ b/contrib/less/cmd.h
@@ -1,14 +1,14 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
-#define	MAX_USERCMD		500
+#define	MAX_USERCMD		1000
 #define	MAX_CMDLEN		16
 
 #define	A_B_LINE		2
diff --git a/contrib/less/cmdbuf.c b/contrib/less/cmdbuf.c
index 804a032..ec25096 100644
--- a/contrib/less/cmdbuf.c
+++ b/contrib/less/cmdbuf.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
@@ -1087,7 +1087,11 @@ init_compl()
 		tk_text = fcomplete(word);
 	} else
 	{
+#if MSDOS_COMPILER
+		char *qword = NULL;
+#else
 		char *qword = shell_quote(word+1);
+#endif
 		if (qword == NULL)
 			tk_text = fcomplete(word+1);
 		else
diff --git a/contrib/less/command.c b/contrib/less/command.c
index de8f52a..5cbab00 100644
--- a/contrib/less/command.c
+++ b/contrib/less/command.c
@@ -1,12 +1,12 @@
 /* $FreeBSD$ */
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
@@ -989,13 +989,15 @@ forw_loop(until_hilite)
 		forward(1, 0, 0);
 	}
 	ignore_eoi = 0;
+	ch_set_eof();
 
 	/*
 	 * This gets us back in "F mode" after processing 
 	 * a non-abort signal (e.g. window-change).  
 	 */
 	if (sigs && !ABORT_SIGS())
-		return (A_F_FOREVER);
+		return (until_hilite ? A_F_UNTIL_HILITE : A_F_FOREVER);
+
 	return (A_NOACTION);
 }
 
diff --git a/contrib/less/cvt.c b/contrib/less/cvt.c
index 85838c4..c3b3e6e 100644
--- a/contrib/less/cvt.c
+++ b/contrib/less/cvt.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 /*
  * Routines to convert text in various ways.  Used by search.
diff --git a/contrib/less/decode.c b/contrib/less/decode.c
index f83a3b6..6d0312d 100644
--- a/contrib/less/decode.c
+++ b/contrib/less/decode.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/defines.ds b/contrib/less/defines.ds
index f344a76..74187e1 100644
--- a/contrib/less/defines.ds
+++ b/contrib/less/defines.ds
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /* DOS definition file for less.  */
@@ -321,6 +321,9 @@
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
 
+/* Define HAVE_FLOAT if your compiler supports the "double" type. */
+#define HAVE_FLOAT 1
+
 /* Define if you have the <limits.h> header file.  */
 #define HAVE_LIMITS_H 1
 
diff --git a/contrib/less/defines.o2 b/contrib/less/defines.o2
index 4ffa45f..d71cf34 100644
--- a/contrib/less/defines.o2
+++ b/contrib/less/defines.o2
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /* OS/2 definition file for less.  */
diff --git a/contrib/less/defines.o9 b/contrib/less/defines.o9
index 278db64..0bb570e 100644
--- a/contrib/less/defines.o9
+++ b/contrib/less/defines.o9
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /* OS/9 definition file for less.  */
diff --git a/contrib/less/defines.wn b/contrib/less/defines.wn
index 07a71eb..d9e0209 100644
--- a/contrib/less/defines.wn
+++ b/contrib/less/defines.wn
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /* Windows definition file for less.  */
diff --git a/contrib/less/edit.c b/contrib/less/edit.c
index 96236b0..5f4e679 100644
--- a/contrib/less/edit.c
+++ b/contrib/less/edit.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 #include "less.h"
diff --git a/contrib/less/filename.c b/contrib/less/filename.c
index e99f81a..14e85e3 100644
--- a/contrib/less/filename.c
+++ b/contrib/less/filename.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/forwback.c b/contrib/less/forwback.c
index 5ece51b..0166266 100644
--- a/contrib/less/forwback.c
+++ b/contrib/less/forwback.c
@@ -1,12 +1,12 @@
 /* $FreeBSD$ */
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/funcs.h b/contrib/less/funcs.h
index 6595232..325ba0e 100644
--- a/contrib/less/funcs.h
+++ b/contrib/less/funcs.h
@@ -46,6 +46,7 @@
 	public void ch_setbufspace ();
 	public void ch_flush ();
 	public int seekable ();
+	public void ch_set_eof ();
 	public void ch_init ();
 	public void ch_close ();
 	public int ch_getflags ();
diff --git a/contrib/less/help.c b/contrib/less/help.c
index 07d6298..85797f6 100644
--- a/contrib/less/help.c
+++ b/contrib/less/help.c
@@ -6,7 +6,7 @@ constant char helpdata[] = {
 '\n',
 ' ',' ',' ',' ',' ',' ','C','o','m','m','a','n','d','s',' ','m','a','r','k','e','d',' ','w','i','t','h',' ','*',' ','m','a','y',' ','b','e',' ','p','r','e','c','e','d','e','d',' ','b','y',' ','a',' ','n','u','m','b','e','r',',',' ','_','\b','N','.','\n',
 ' ',' ',' ',' ',' ',' ','N','o','t','e','s',' ','i','n',' ','p','a','r','e','n','t','h','e','s','e','s',' ','i','n','d','i','c','a','t','e',' ','t','h','e',' ','b','e','h','a','v','i','o','r',' ','i','f',' ','_','\b','N',' ','i','s',' ','g','i','v','e','n','.','\n',
-' ',' ',' ',' ',' ',' ','A',' ','k','e','y',' ','p','r','e','c','e','d','e','d',' ','b','y',' ','a',' ','c','a','r','a','t',' ','i','n','d','i','c','a','t','e','s',' ','t','h','e',' ','C','t','r','l',' ','k','e','y',';',' ','t','h','u','s',' ','^','K',' ','i','s',' ','c','t','r','l','-','K','.','\n',
+' ',' ',' ',' ',' ',' ','A',' ','k','e','y',' ','p','r','e','c','e','d','e','d',' ','b','y',' ','a',' ','c','a','r','e','t',' ','i','n','d','i','c','a','t','e','s',' ','t','h','e',' ','C','t','r','l',' ','k','e','y',';',' ','t','h','u','s',' ','^','K',' ','i','s',' ','c','t','r','l','-','K','.','\n',
 '\n',
 ' ',' ','h',' ',' ','H',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','i','s','p','l','a','y',' ','t','h','i','s',' ','h','e','l','p','.','\n',
 ' ',' ','q',' ',' ',':','q',' ',' ','Q',' ',' ',':','Q',' ',' ','Z','Z',' ',' ',' ',' ',' ','E','x','i','t','.','\n',
diff --git a/contrib/less/ifile.c b/contrib/less/ifile.c
index 68bea92..3e5e855 100644
--- a/contrib/less/ifile.c
+++ b/contrib/less/ifile.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/input.c b/contrib/less/input.c
index 9e3cf03..b211323 100644
--- a/contrib/less/input.c
+++ b/contrib/less/input.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/jump.c b/contrib/less/jump.c
index 90ab4b1..075aa64 100644
--- a/contrib/less/jump.c
+++ b/contrib/less/jump.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/less.h b/contrib/less/less.h
index efdf66b..b74e2c8 100644
--- a/contrib/less/less.h
+++ b/contrib/less/less.h
@@ -1,12 +1,12 @@
 /* $FreeBSD$ */
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 #define NEWBOT 1
 
diff --git a/contrib/less/less.hlp b/contrib/less/less.hlp
index 1194a63..a850561 100644
--- a/contrib/less/less.hlp
+++ b/contrib/less/less.hlp
@@ -3,7 +3,7 @@
 
       Commands marked with * may be preceded by a number, _N.
       Notes in parentheses indicate the behavior if _N is given.
-      A key preceded by a carat indicates the Ctrl key; thus ^K is ctrl-K.
+      A key preceded by a caret indicates the Ctrl key; thus ^K is ctrl-K.
 
   h  H                 Display this help.
   q  :q  Q  :Q  ZZ     Exit.
diff --git a/contrib/less/less.man b/contrib/less/less.man
index 913f38c..1dab1c2 100644
--- a/contrib/less/less.man
+++ b/contrib/less/less.man
@@ -1606,4 +1606,4 @@ LESS(1)                                                                LESS(1)
 
 
 
-                           Version 449: 26 Jun 2012                    LESS(1)
+                           Version 451: 21 Jul 2012                    LESS(1)
diff --git a/contrib/less/less.nro b/contrib/less/less.nro
index 0ee7441..9c00d21 100644
--- a/contrib/less/less.nro
+++ b/contrib/less/less.nro
@@ -1,4 +1,4 @@
-.TH LESS 1 "Version 449: 26 Jun 2012"
+.TH LESS 1 "Version 451: 21 Jul 2012"
 .SH NAME
 less \- opposite of more
 .SH SYNOPSIS
diff --git a/contrib/less/lessecho.c b/contrib/less/lessecho.c
index cdadd72..7098f2d 100644
--- a/contrib/less/lessecho.c
+++ b/contrib/less/lessecho.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/lessecho.man b/contrib/less/lessecho.man
index e28f3c1..8dda5ab 100644
--- a/contrib/less/lessecho.man
+++ b/contrib/less/lessecho.man
@@ -51,4 +51,4 @@ LESSECHO(1)                                                        LESSECHO(1)
 
 
 
-                           Version 449: 26 Jun 2012                LESSECHO(1)
+                           Version 451: 21 Jul 2012                LESSECHO(1)
diff --git a/contrib/less/lessecho.nro b/contrib/less/lessecho.nro
index a2030c7..0e62698 100644
--- a/contrib/less/lessecho.nro
+++ b/contrib/less/lessecho.nro
@@ -1,4 +1,4 @@
-.TH LESSECHO 1 "Version 449: 26 Jun 2012"
+.TH LESSECHO 1 "Version 451: 21 Jul 2012"
 .SH NAME
 lessecho \- expand metacharacters
 .SH SYNOPSIS
diff --git a/contrib/less/lesskey.c b/contrib/less/lesskey.c
index e01d289..3d7571e 100644
--- a/contrib/less/lesskey.c
+++ b/contrib/less/lesskey.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
@@ -449,7 +449,7 @@ tstr(pp, xlate)
 		}
 	case '^':
 		/*
-		 * Carat means CONTROL.
+		 * Caret means CONTROL.
 		 */
 		*pp = p+2;
 		buf[0] = CONTROL(p[1]);
diff --git a/contrib/less/lesskey.h b/contrib/less/lesskey.h
index cb44d2c..91098a5 100644
--- a/contrib/less/lesskey.h
+++ b/contrib/less/lesskey.h
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/lesskey.man b/contrib/less/lesskey.man
index ea0562f..968ee1b 100644
--- a/contrib/less/lesskey.man
+++ b/contrib/less/lesskey.man
@@ -349,10 +349,8 @@ LESSKEY(1)                                                          LESSKEY(1)
 
 AUTHOR
        Mark Nudelman <bug-less@gnu.org>
-       Send  bug  reports  or  comments  to  the  above  address  or  to  bug-
-       less@gnu.org.
+       Send bug reports or comments to bug-less@gnu.org.
 
 
 
-
-                           Version 449: 26 Jun 2012                 LESSKEY(1)
+                           Version 451: 21 Jul 2012                 LESSKEY(1)
diff --git a/contrib/less/lesskey.nro b/contrib/less/lesskey.nro
index 1a066b9..4b6f2f4 100644
--- a/contrib/less/lesskey.nro
+++ b/contrib/less/lesskey.nro
@@ -1,4 +1,4 @@
-.TH LESSKEY 1 "Version 449: 26 Jun 2012"
+.TH LESSKEY 1 "Version 451: 21 Jul 2012"
 .SH NAME
 lesskey \- specify key bindings for less
 .SH SYNOPSIS
@@ -378,5 +378,4 @@ Suite 330, Boston, MA  02111-1307, USA.
 .PP
 Mark Nudelman <bug-less@gnu.org>
 .br
-Send bug reports or comments to the above address or to bug-less@gnu.org.
-
+Send bug reports or comments to bug-less@gnu.org.
diff --git a/contrib/less/lglob.h b/contrib/less/lglob.h
index 4e0a41f..b08d24c 100644
--- a/contrib/less/lglob.h
+++ b/contrib/less/lglob.h
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/line.c b/contrib/less/line.c
index 6bc7410..1ded88d 100644
--- a/contrib/less/line.c
+++ b/contrib/less/line.c
@@ -1,12 +1,12 @@
 /* $FreeBSD$ */
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/linenum.c b/contrib/less/linenum.c
index 807eb30..4f45be8 100644
--- a/contrib/less/linenum.c
+++ b/contrib/less/linenum.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/lsystem.c b/contrib/less/lsystem.c
index 1b3fa04..674e5a2 100644
--- a/contrib/less/lsystem.c
+++ b/contrib/less/lsystem.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/main.c b/contrib/less/main.c
index 3bd7ecf..4a66147 100644
--- a/contrib/less/main.c
+++ b/contrib/less/main.c
@@ -1,12 +1,12 @@
 /* $FreeBSD$ */
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/mark.c b/contrib/less/mark.c
index f95866c..c61ce03 100644
--- a/contrib/less/mark.c
+++ b/contrib/less/mark.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 #include "less.h"
diff --git a/contrib/less/mkhelp.c b/contrib/less/mkhelp.c
index 94d1894..45530fd 100644
--- a/contrib/less/mkhelp.c
+++ b/contrib/less/mkhelp.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/optfunc.c b/contrib/less/optfunc.c
index b4288d7..e3cd57f 100644
--- a/contrib/less/optfunc.c
+++ b/contrib/less/optfunc.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/option.c b/contrib/less/option.c
index cf5ed36..22de614 100644
--- a/contrib/less/option.c
+++ b/contrib/less/option.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/option.h b/contrib/less/option.h
index 00b4b7d..c11ad3b 100644
--- a/contrib/less/option.h
+++ b/contrib/less/option.h
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 #define	END_OPTION_STRING	('$')
diff --git a/contrib/less/opttbl.c b/contrib/less/opttbl.c
index 615fb27..0146793 100644
--- a/contrib/less/opttbl.c
+++ b/contrib/less/opttbl.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/os.c b/contrib/less/os.c
index f59c0d4..eb75bba 100644
--- a/contrib/less/os.c
+++ b/contrib/less/os.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/output.c b/contrib/less/output.c
index ba07421..bcc8471 100644
--- a/contrib/less/output.c
+++ b/contrib/less/output.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
@@ -272,13 +272,16 @@ flush()
 						break;
 					if (at & 1)
 					{
-#if MSDOS_COMPILER==WIN32C
-						fg |= FOREGROUND_INTENSITY;
-						bg |= BACKGROUND_INTENSITY;
-#else
-						fg = bo_fg_color;
-						bg = bo_bg_color;
-#endif
+						/*
+						 * If \e[1m use defined bold
+						 * color, else set intensity.
+						 */
+						if (p[-2] == '[')
+						{
+							fg = bo_fg_color;
+							bg = bo_bg_color;
+						} else
+							fg |= 8;
 					} else if (at & 2)
 					{
 						fg = so_fg_color;
diff --git a/contrib/less/pattern.c b/contrib/less/pattern.c
index 606f28c..fa26b99 100644
--- a/contrib/less/pattern.c
+++ b/contrib/less/pattern.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 /*
  * Routines to do pattern matching.
diff --git a/contrib/less/pattern.h b/contrib/less/pattern.h
index 2bcc7ab..0a90d5d 100644
--- a/contrib/less/pattern.h
+++ b/contrib/less/pattern.h
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 #if HAVE_GNU_REGEX
 #define __USE_GNU 1
diff --git a/contrib/less/pckeys.h b/contrib/less/pckeys.h
index 306ffde..b673756 100644
--- a/contrib/less/pckeys.h
+++ b/contrib/less/pckeys.h
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/position.c b/contrib/less/position.c
index 234dc94..9518307 100644
--- a/contrib/less/position.c
+++ b/contrib/less/position.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/position.h b/contrib/less/position.h
index e0ab360..3b96637 100644
--- a/contrib/less/position.h
+++ b/contrib/less/position.h
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/prompt.c b/contrib/less/prompt.c
index e1f8e17..e430202 100644
--- a/contrib/less/prompt.c
+++ b/contrib/less/prompt.c
@@ -1,12 +1,12 @@
 /* $FreeBSD$ */
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/screen.c b/contrib/less/screen.c
index 8b4fdbd..48b41b9 100644
--- a/contrib/less/screen.c
+++ b/contrib/less/screen.c
@@ -1,12 +1,12 @@
 /* $FreeBSD$ */
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/scrsize.c b/contrib/less/scrsize.c
index b9c7a49..9f786fe 100644
--- a/contrib/less/scrsize.c
+++ b/contrib/less/scrsize.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 /*
  * This program is used to determine the screen dimensions on OS/2 systems.
diff --git a/contrib/less/search.c b/contrib/less/search.c
index e0bdddb..056deb5 100644
--- a/contrib/less/search.c
+++ b/contrib/less/search.c
@@ -1,12 +1,12 @@
 /* $FreeBSD$ */
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/signal.c b/contrib/less/signal.c
index 8c64ce7..9c6c2f6 100644
--- a/contrib/less/signal.c
+++ b/contrib/less/signal.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 /* $FreeBSD$ */
 
diff --git a/contrib/less/tags.c b/contrib/less/tags.c
index 8fd36b5..51fbb56 100644
--- a/contrib/less/tags.c
+++ b/contrib/less/tags.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 #include "less.h"
diff --git a/contrib/less/ttyin.c b/contrib/less/ttyin.c
index b2f5262..db6e72e 100644
--- a/contrib/less/ttyin.c
+++ b/contrib/less/ttyin.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
diff --git a/contrib/less/version.c b/contrib/less/version.c
index 096ae20..926e840 100644
--- a/contrib/less/version.c
+++ b/contrib/less/version.c
@@ -1,11 +1,11 @@
-/*

- * Copyright (C) 1984-2012  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.

- *

- * For more information, see the README file.

- */

+/*
+ * Copyright (C) 1984-2012  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.
+ *
+ * For more information, see the README file.
+ */
 
 
 /*
@@ -751,6 +751,8 @@ v446  5/15/12   Up/down arrows in cmd editing search for matching cmd.
 v447  5/21/12   Add ESC-F command, two-pipe LESSOPEN syntax.
 v448  6/15/12   Print name of regex library in version message.
 v449  6/23/12   Allow config option --with-regex=none.
+v450  7/4/12    Fix EOF bug with ESC-F.
+v451  7/20/12   Fix typo.
 */
 
-char version[] = "449";
+char version[] = "451";