Author: delphij
Date: Tue Jul 24 01:09:11 2012
New Revision: 238730
URL: http://svn.freebsd.org/changeset/base/238730
Log:
MFV: less v451.
Modified:
head/contrib/less/NEWS
head/contrib/less/README
head/contrib/less/brac.c
head/contrib/less/ch.c
head/contrib/less/charset.c
head/contrib/less/charset.h
head/contrib/less/cmd.h
head/contrib/less/cmdbuf.c
head/contrib/less/command.c
head/contrib/less/cvt.c
head/contrib/less/decode.c
head/contrib/less/defines.ds
head/contrib/less/defines.o2
head/contrib/less/defines.o9
head/contrib/less/defines.wn
head/contrib/less/edit.c
head/contrib/less/filename.c
head/contrib/less/forwback.c
head/contrib/less/funcs.h
head/contrib/less/help.c
head/contrib/less/ifile.c
head/contrib/less/input.c
head/contrib/less/jump.c
head/contrib/less/less.h
head/contrib/less/less.hlp
head/contrib/less/less.man
head/contrib/less/less.nro
head/contrib/less/lessecho.c
head/contrib/less/lessecho.man
head/contrib/less/lessecho.nro
head/contrib/less/lesskey.c
head/contrib/less/lesskey.h
head/contrib/less/lesskey.man
head/contrib/less/lesskey.nro
head/contrib/less/lglob.h
head/contrib/less/line.c
head/contrib/less/linenum.c
head/contrib/less/lsystem.c
head/contrib/less/main.c
head/contrib/less/mark.c
head/contrib/less/mkhelp.c
head/contrib/less/optfunc.c
head/contrib/less/option.c
head/contrib/less/option.h
head/contrib/less/opttbl.c
head/contrib/less/os.c
head/contrib/less/output.c
head/contrib/less/pattern.c
head/contrib/less/pattern.h
head/contrib/less/pckeys.h
head/contrib/less/position.c
head/contrib/less/position.h
head/contrib/less/prompt.c
head/contrib/less/screen.c
head/contrib/less/scrsize.c
head/contrib/less/search.c
head/contrib/less/signal.c
head/contrib/less/tags.c
head/contrib/less/ttyin.c
head/contrib/less/version.c
Directory Properties:
head/contrib/less/ (props changed)
Modified: head/contrib/less/NEWS
==============================================================================
--- head/contrib/less/NEWS Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/NEWS Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
Modified: head/contrib/less/README
==============================================================================
--- head/contrib/less/README Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/README Tue Jul 24 01:09:11 2012 (r238730)
@@ -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
Modified: head/contrib/less/brac.c
==============================================================================
--- head/contrib/less/brac.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/brac.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/ch.c
==============================================================================
--- head/contrib/less/ch.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/ch.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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
Modified: head/contrib/less/charset.c
==============================================================================
--- head/contrib/less/charset.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/charset.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/charset.h
==============================================================================
--- head/contrib/less/charset.h Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/charset.h Tue Jul 24 01:09:11 2012 (r238730)
@@ -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)
Modified: head/contrib/less/cmd.h
==============================================================================
--- head/contrib/less/cmd.h Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/cmd.h Tue Jul 24 01:09:11 2012 (r238730)
@@ -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
Modified: head/contrib/less/cmdbuf.c
==============================================================================
--- head/contrib/less/cmdbuf.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/cmdbuf.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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
Modified: head/contrib/less/command.c
==============================================================================
--- head/contrib/less/command.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/command.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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);
}
Modified: head/contrib/less/cvt.c
==============================================================================
--- head/contrib/less/cvt.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/cvt.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
Modified: head/contrib/less/decode.c
==============================================================================
--- head/contrib/less/decode.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/decode.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/defines.ds
==============================================================================
--- head/contrib/less/defines.ds Mon Jul 23 23:40:13 2012
(r238729)
+++ head/contrib/less/defines.ds Tue Jul 24 01:09:11 2012
(r238730)
@@ -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
Modified: head/contrib/less/defines.o2
==============================================================================
--- head/contrib/less/defines.o2 Mon Jul 23 23:40:13 2012
(r238729)
+++ head/contrib/less/defines.o2 Tue Jul 24 01:09:11 2012
(r238730)
@@ -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. */
Modified: head/contrib/less/defines.o9
==============================================================================
--- head/contrib/less/defines.o9 Mon Jul 23 23:40:13 2012
(r238729)
+++ head/contrib/less/defines.o9 Tue Jul 24 01:09:11 2012
(r238730)
@@ -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. */
Modified: head/contrib/less/defines.wn
==============================================================================
--- head/contrib/less/defines.wn Mon Jul 23 23:40:13 2012
(r238729)
+++ head/contrib/less/defines.wn Tue Jul 24 01:09:11 2012
(r238730)
@@ -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. */
Modified: head/contrib/less/edit.c
==============================================================================
--- head/contrib/less/edit.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/edit.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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"
Modified: head/contrib/less/filename.c
==============================================================================
--- head/contrib/less/filename.c Mon Jul 23 23:40:13 2012
(r238729)
+++ head/contrib/less/filename.c Tue Jul 24 01:09:11 2012
(r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/forwback.c
==============================================================================
--- head/contrib/less/forwback.c Mon Jul 23 23:40:13 2012
(r238729)
+++ head/contrib/less/forwback.c Tue Jul 24 01:09:11 2012
(r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/funcs.h
==============================================================================
--- head/contrib/less/funcs.h Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/funcs.h Tue Jul 24 01:09:11 2012 (r238730)
@@ -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 ();
Modified: head/contrib/less/help.c
==============================================================================
--- head/contrib/less/help.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/help.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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',
Modified: head/contrib/less/ifile.c
==============================================================================
--- head/contrib/less/ifile.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/ifile.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/input.c
==============================================================================
--- head/contrib/less/input.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/input.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/jump.c
==============================================================================
--- head/contrib/less/jump.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/jump.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/less.h
==============================================================================
--- head/contrib/less/less.h Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/less.h Tue Jul 24 01:09:11 2012 (r238730)
@@ -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
Modified: head/contrib/less/less.hlp
==============================================================================
--- head/contrib/less/less.hlp Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/less.hlp Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
Modified: head/contrib/less/less.man
==============================================================================
--- head/contrib/less/less.man Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/less.man Tue Jul 24 01:09:11 2012 (r238730)
@@ -1606,4 +1606,4 @@ LESS(1)
- Version 449: 26 Jun 2012 LESS(1)
+ Version 451: 21 Jul 2012 LESS(1)
Modified: head/contrib/less/less.nro
==============================================================================
--- head/contrib/less/less.nro Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/less.nro Tue Jul 24 01:09:11 2012 (r238730)
@@ -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
Modified: head/contrib/less/lessecho.c
==============================================================================
--- head/contrib/less/lessecho.c Mon Jul 23 23:40:13 2012
(r238729)
+++ head/contrib/less/lessecho.c Tue Jul 24 01:09:11 2012
(r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/lessecho.man
==============================================================================
--- head/contrib/less/lessecho.man Mon Jul 23 23:40:13 2012
(r238729)
+++ head/contrib/less/lessecho.man Tue Jul 24 01:09:11 2012
(r238730)
@@ -51,4 +51,4 @@ LESSECHO(1)
- Version 449: 26 Jun 2012 LESSECHO(1)
+ Version 451: 21 Jul 2012 LESSECHO(1)
Modified: head/contrib/less/lessecho.nro
==============================================================================
--- head/contrib/less/lessecho.nro Mon Jul 23 23:40:13 2012
(r238729)
+++ head/contrib/less/lessecho.nro Tue Jul 24 01:09:11 2012
(r238730)
@@ -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
Modified: head/contrib/less/lesskey.c
==============================================================================
--- head/contrib/less/lesskey.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/lesskey.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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]);
Modified: head/contrib/less/lesskey.h
==============================================================================
--- head/contrib/less/lesskey.h Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/lesskey.h Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/lesskey.man
==============================================================================
--- head/contrib/less/lesskey.man Mon Jul 23 23:40:13 2012
(r238729)
+++ head/contrib/less/lesskey.man Tue Jul 24 01:09:11 2012
(r238730)
@@ -349,10 +349,8 @@ LESSKEY(1)
[1mAUTHOR[0m
Mark Nudelman <bug-l...@gnu.org>
- Send bug reports or comments to the above address or to bug-
- l...@gnu.org.
+ Send bug reports or comments to bug-l...@gnu.org.
-
- Version 449: 26 Jun 2012 LESSKEY(1)
+ Version 451: 21 Jul 2012 LESSKEY(1)
Modified: head/contrib/less/lesskey.nro
==============================================================================
--- head/contrib/less/lesskey.nro Mon Jul 23 23:40:13 2012
(r238729)
+++ head/contrib/less/lesskey.nro Tue Jul 24 01:09:11 2012
(r238730)
@@ -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-l...@gnu.org>
.br
-Send bug reports or comments to the above address or to bug-l...@gnu.org.
-
+Send bug reports or comments to bug-l...@gnu.org.
Modified: head/contrib/less/lglob.h
==============================================================================
--- head/contrib/less/lglob.h Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/lglob.h Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/line.c
==============================================================================
--- head/contrib/less/line.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/line.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/linenum.c
==============================================================================
--- head/contrib/less/linenum.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/linenum.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/lsystem.c
==============================================================================
--- head/contrib/less/lsystem.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/lsystem.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/main.c
==============================================================================
--- head/contrib/less/main.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/main.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/mark.c
==============================================================================
--- head/contrib/less/mark.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/mark.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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"
Modified: head/contrib/less/mkhelp.c
==============================================================================
--- head/contrib/less/mkhelp.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/mkhelp.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/optfunc.c
==============================================================================
--- head/contrib/less/optfunc.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/optfunc.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/option.c
==============================================================================
--- head/contrib/less/option.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/option.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/option.h
==============================================================================
--- head/contrib/less/option.h Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/option.h Tue Jul 24 01:09:11 2012 (r238730)
@@ -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 ('$')
Modified: head/contrib/less/opttbl.c
==============================================================================
--- head/contrib/less/opttbl.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/opttbl.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/os.c
==============================================================================
--- head/contrib/less/os.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/os.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
+ */
/*
Modified: head/contrib/less/output.c
==============================================================================
--- head/contrib/less/output.c Mon Jul 23 23:40:13 2012 (r238729)
+++ head/contrib/less/output.c Tue Jul 24 01:09:11 2012 (r238730)
@@ -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.
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
