aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2012-07-23 21:31:53 +0000
committerXin LI <delphij@FreeBSD.org>2012-07-23 21:31:53 +0000
commit9fd1a2751f1696d0214ae5bd77550d31eb4dcd2e (patch)
treeca2905ac4039d0a117f9280c5c4c77c235bcb95d
parentae8c2162b0f1c1823dae013469f900b9882b77a2 (diff)
downloadsrc-9fd1a2751f1696d0214ae5bd77550d31eb4dcd2e.tar.gz
src-9fd1a2751f1696d0214ae5bd77550d31eb4dcd2e.zip
Vendor import of v451 (beta)vendor/less/v451
Notes
Notes: svn path=/vendor/less/dist/; revision=238727 svn path=/vendor/less/v451/; revision=238728; tag=vendor/less/v451
-rw-r--r--NEWS2
-rw-r--r--README4
-rw-r--r--brac.c16
-rw-r--r--ch.c27
-rw-r--r--charset.c16
-rw-r--r--charset.h16
-rw-r--r--cmd.h18
-rw-r--r--cmdbuf.c20
-rw-r--r--command.c20
-rw-r--r--cvt.c16
-rw-r--r--decode.c16
-rw-r--r--defines.ds19
-rw-r--r--defines.o216
-rw-r--r--defines.o916
-rw-r--r--defines.wn16
-rw-r--r--edit.c16
-rw-r--r--filename.c16
-rw-r--r--forwback.c16
-rw-r--r--funcs.h1
-rw-r--r--help.c2
-rw-r--r--ifile.c16
-rw-r--r--input.c16
-rw-r--r--jump.c16
-rw-r--r--less.h16
-rw-r--r--less.hlp2
-rw-r--r--less.man2
-rw-r--r--less.nro2
-rw-r--r--lessecho.c16
-rw-r--r--lessecho.man2
-rw-r--r--lessecho.nro2
-rw-r--r--lesskey.c18
-rw-r--r--lesskey.h16
-rw-r--r--lesskey.man6
-rw-r--r--lesskey.nro5
-rw-r--r--lglob.h16
-rw-r--r--line.c16
-rw-r--r--linenum.c16
-rw-r--r--lsystem.c16
-rw-r--r--main.c16
-rw-r--r--mark.c16
-rw-r--r--mkhelp.c16
-rw-r--r--optfunc.c16
-rw-r--r--option.c16
-rw-r--r--option.h16
-rw-r--r--opttbl.c16
-rw-r--r--os.c16
-rw-r--r--output.c33
-rw-r--r--pattern.c16
-rw-r--r--pattern.h16
-rw-r--r--pckeys.h16
-rw-r--r--position.c16
-rw-r--r--position.h16
-rw-r--r--prompt.c16
-rw-r--r--screen.c16
-rw-r--r--scrsize.c16
-rw-r--r--search.c16
-rw-r--r--signal.c16
-rw-r--r--tags.c16
-rw-r--r--ttyin.c16
-rw-r--r--version.c20
60 files changed, 442 insertions, 419 deletions
diff --git a/NEWS b/NEWS
index 9a8ea26372f0..e0979cf56c3d 100644
--- a/NEWS
+++ b/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/README b/README
index d19461852c09..521856bc5952 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
- 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/brac.c b/brac.c
index fcf9ed216fb6..70a7771ee308 100644
--- a/brac.c
+++ b/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/ch.c b/ch.c
index 8e431df5fdf9..2e2ded7d17a5 100644
--- a/ch.c
+++ b/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/charset.c b/charset.c
index 4ce6a54f09bf..03b38e036431 100644
--- a/charset.c
+++ b/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/charset.h b/charset.h
index 0ae636646a93..7df4df62c205 100644
--- a/charset.h
+++ b/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/cmd.h b/cmd.h
index 627f85bcf0a5..9a721602db42 100644
--- a/cmd.h
+++ b/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/cmdbuf.c b/cmdbuf.c
index 804a0329b138..ec25096b7b0d 100644
--- a/cmdbuf.c
+++ b/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/command.c b/command.c
index 10f1ad900573..ed5b3238599c 100644
--- a/command.c
+++ b/command.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.
+ */
/*
@@ -983,13 +983,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/cvt.c b/cvt.c
index 85838c48ee76..c3b3e6e7420c 100644
--- a/cvt.c
+++ b/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/decode.c b/decode.c
index f83a3b638790..6d0312d8890a 100644
--- a/decode.c
+++ b/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/defines.ds b/defines.ds
index f344a76816e4..74187e195f8f 100644
--- a/defines.ds
+++ b/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/defines.o2 b/defines.o2
index 4ffa45fcdb4d..d71cf347eb94 100644
--- a/defines.o2
+++ b/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/defines.o9 b/defines.o9
index 278db64024cc..0bb570ed725a 100644
--- a/defines.o9
+++ b/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/defines.wn b/defines.wn
index 07a71eb85029..d9e02099f3f0 100644
--- a/defines.wn
+++ b/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/edit.c b/edit.c
index 96236b07664a..5f4e679fd1cc 100644
--- a/edit.c
+++ b/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/filename.c b/filename.c
index e99f81a099b5..14e85e32cc2d 100644
--- a/filename.c
+++ b/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/forwback.c b/forwback.c
index ec744484e927..21b500c2d5d1 100644
--- a/forwback.c
+++ b/forwback.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/funcs.h b/funcs.h
index 6595232e3dd1..325ba0e1f7ae 100644
--- a/funcs.h
+++ b/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/help.c b/help.c
index 07d62985b68d..85797f62a66e 100644
--- a/help.c
+++ b/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/ifile.c b/ifile.c
index 68bea9295710..3e5e855cdf7e 100644
--- a/ifile.c
+++ b/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/input.c b/input.c
index 9e3cf036e5b3..b211323e50df 100644
--- a/input.c
+++ b/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/jump.c b/jump.c
index 90ab4b18e941..075aa64d597b 100644
--- a/jump.c
+++ b/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/less.h b/less.h
index 3ef89b1d47d8..fada51331cb7 100644
--- a/less.h
+++ b/less.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 NEWBOT 1
diff --git a/less.hlp b/less.hlp
index 1194a6339ba6..a8505619e6b5 100644
--- a/less.hlp
+++ b/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/less.man b/less.man
index 913f38c45ea0..1dab1c27ceaa 100644
--- a/less.man
+++ b/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/less.nro b/less.nro
index 0ee74418fd45..9c00d21ae74c 100644
--- a/less.nro
+++ b/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/lessecho.c b/lessecho.c
index cdadd7249eda..7098f2d447ac 100644
--- a/lessecho.c
+++ b/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/lessecho.man b/lessecho.man
index e28f3c1f05b0..8dda5ab9284d 100644
--- a/lessecho.man
+++ b/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/lessecho.nro b/lessecho.nro
index a2030c77c0f9..0e6269806f72 100644
--- a/lessecho.nro
+++ b/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/lesskey.c b/lesskey.c
index e01d28980d43..3d7571ecb4cf 100644
--- a/lesskey.c
+++ b/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/lesskey.h b/lesskey.h
index cb44d2c42f5b..91098a59aa28 100644
--- a/lesskey.h
+++ b/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/lesskey.man b/lesskey.man
index ea0562ff1a4f..968ee1b5d047 100644
--- a/lesskey.man
+++ b/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/lesskey.nro b/lesskey.nro
index 1a066b96d77d..4b6f2f4fb3a6 100644
--- a/lesskey.nro
+++ b/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/lglob.h b/lglob.h
index 4e0a41f77925..b08d24c159a0 100644
--- a/lglob.h
+++ b/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/line.c b/line.c
index 4384b19d2e35..1eb391490158 100644
--- a/line.c
+++ b/line.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/linenum.c b/linenum.c
index 807eb30ac153..4f45be8748fe 100644
--- a/linenum.c
+++ b/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/lsystem.c b/lsystem.c
index 1b3fa04e2f42..674e5a28e18e 100644
--- a/lsystem.c
+++ b/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/main.c b/main.c
index 9fe463ada1bd..da61b6bbeffa 100644
--- a/main.c
+++ b/main.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/mark.c b/mark.c
index f95866c91e9a..c61ce034cb29 100644
--- a/mark.c
+++ b/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/mkhelp.c b/mkhelp.c
index 94d189482b7d..45530fd1c036 100644
--- a/mkhelp.c
+++ b/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/optfunc.c b/optfunc.c
index b4288d78bb5b..e3cd57f96d9c 100644
--- a/optfunc.c
+++ b/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/option.c b/option.c
index cf5ed36a72c5..22de61488e82 100644
--- a/option.c
+++ b/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/option.h b/option.h
index 00b4b7d1fd62..c11ad3b4f012 100644
--- a/option.h
+++ b/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/opttbl.c b/opttbl.c
index 615fb2785c46..0146793658de 100644
--- a/opttbl.c
+++ b/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/os.c b/os.c
index f59c0d4f3f99..eb75bbae464c 100644
--- a/os.c
+++ b/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/output.c b/output.c
index ba0742130248..bcc8471c861b 100644
--- a/output.c
+++ b/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/pattern.c b/pattern.c
index 606f28cb67e3..fa26b99379fc 100644
--- a/pattern.c
+++ b/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/pattern.h b/pattern.h
index c91a2cc9c441..7d05fdeb88e0 100644
--- a/pattern.h
+++ b/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/pckeys.h b/pckeys.h
index 306ffde8992f..b67375683088 100644
--- a/pckeys.h
+++ b/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/position.c b/position.c
index 234dc94e3b5d..95183073d4c4 100644
--- a/position.c
+++ b/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/position.h b/position.h
index e0ab36059dc4..3b96637067ef 100644
--- a/position.h
+++ b/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/prompt.c b/prompt.c
index 49361fa0c927..f374101cfa38 100644
--- a/prompt.c
+++ b/prompt.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/screen.c b/screen.c
index 132b3d7f9c99..688ba20ae868 100644
--- a/screen.c
+++ b/screen.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/scrsize.c b/scrsize.c
index b9c7a492ba6e..9f786fecbb9b 100644
--- a/scrsize.c
+++ b/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/search.c b/search.c
index f09c068a5591..24d4210a0135 100644
--- a/search.c
+++ b/search.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/signal.c b/signal.c
index 83dc76446462..7bf5b51919df 100644
--- a/signal.c
+++ b/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.
+ */
/*
diff --git a/tags.c b/tags.c
index 8fd36b555c69..51fbb568e4b6 100644
--- a/tags.c
+++ b/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/ttyin.c b/ttyin.c
index b2f5262fd3b8..db6e72e0baab 100644
--- a/ttyin.c
+++ b/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/version.c b/version.c
index 096ae2066728..926e84067aed 100644
--- a/version.c
+++ b/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";