diff options
| author | Xin LI <delphij@FreeBSD.org> | 2012-07-23 21:31:53 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2012-07-23 21:31:53 +0000 |
| commit | 9fd1a2751f1696d0214ae5bd77550d31eb4dcd2e (patch) | |
| tree | ca2905ac4039d0a117f9280c5c4c77c235bcb95d | |
| parent | ae8c2162b0f1c1823dae013469f900b9882b77a2 (diff) | |
Notes
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | brac.c | 16 | ||||
| -rw-r--r-- | ch.c | 27 | ||||
| -rw-r--r-- | charset.c | 16 | ||||
| -rw-r--r-- | charset.h | 16 | ||||
| -rw-r--r-- | cmd.h | 18 | ||||
| -rw-r--r-- | cmdbuf.c | 20 | ||||
| -rw-r--r-- | command.c | 20 | ||||
| -rw-r--r-- | cvt.c | 16 | ||||
| -rw-r--r-- | decode.c | 16 | ||||
| -rw-r--r-- | defines.ds | 19 | ||||
| -rw-r--r-- | defines.o2 | 16 | ||||
| -rw-r--r-- | defines.o9 | 16 | ||||
| -rw-r--r-- | defines.wn | 16 | ||||
| -rw-r--r-- | edit.c | 16 | ||||
| -rw-r--r-- | filename.c | 16 | ||||
| -rw-r--r-- | forwback.c | 16 | ||||
| -rw-r--r-- | funcs.h | 1 | ||||
| -rw-r--r-- | help.c | 2 | ||||
| -rw-r--r-- | ifile.c | 16 | ||||
| -rw-r--r-- | input.c | 16 | ||||
| -rw-r--r-- | jump.c | 16 | ||||
| -rw-r--r-- | less.h | 16 | ||||
| -rw-r--r-- | less.hlp | 2 | ||||
| -rw-r--r-- | less.man | 2 | ||||
| -rw-r--r-- | less.nro | 2 | ||||
| -rw-r--r-- | lessecho.c | 16 | ||||
| -rw-r--r-- | lessecho.man | 2 | ||||
| -rw-r--r-- | lessecho.nro | 2 | ||||
| -rw-r--r-- | lesskey.c | 18 | ||||
| -rw-r--r-- | lesskey.h | 16 | ||||
| -rw-r--r-- | lesskey.man | 6 | ||||
| -rw-r--r-- | lesskey.nro | 5 | ||||
| -rw-r--r-- | lglob.h | 16 | ||||
| -rw-r--r-- | line.c | 16 | ||||
| -rw-r--r-- | linenum.c | 16 | ||||
| -rw-r--r-- | lsystem.c | 16 | ||||
| -rw-r--r-- | main.c | 16 | ||||
| -rw-r--r-- | mark.c | 16 | ||||
| -rw-r--r-- | mkhelp.c | 16 | ||||
| -rw-r--r-- | optfunc.c | 16 | ||||
| -rw-r--r-- | option.c | 16 | ||||
| -rw-r--r-- | option.h | 16 | ||||
| -rw-r--r-- | opttbl.c | 16 | ||||
| -rw-r--r-- | os.c | 16 | ||||
| -rw-r--r-- | output.c | 33 | ||||
| -rw-r--r-- | pattern.c | 16 | ||||
| -rw-r--r-- | pattern.h | 16 | ||||
| -rw-r--r-- | pckeys.h | 16 | ||||
| -rw-r--r-- | position.c | 16 | ||||
| -rw-r--r-- | position.h | 16 | ||||
| -rw-r--r-- | prompt.c | 16 | ||||
| -rw-r--r-- | screen.c | 16 | ||||
| -rw-r--r-- | scrsize.c | 16 | ||||
| -rw-r--r-- | search.c | 16 | ||||
| -rw-r--r-- | signal.c | 16 | ||||
| -rw-r--r-- | tags.c | 16 | ||||
| -rw-r--r-- | ttyin.c | 16 | ||||
| -rw-r--r-- | version.c | 20 |
60 files changed, 442 insertions, 419 deletions
@@ -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. @@ -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 @@ -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. + */ /* @@ -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 4ce6a54f09bf8..03b38e036431e 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 0ae636646a93b..7df4df62c2050 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) @@ -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 804a0329b1389..ec25096b7b0d9 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 10f1ad9005738..ed5b3238599c2 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); } @@ -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 f83a3b6387909..6d0312d8890ad 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 f344a76816e46..74187e195f8f2 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 4ffa45fcdb4d2..d71cf347eb943 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 278db64024ccf..0bb570ed725ab 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 07a71eb850295..d9e02099f3f0f 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. */ @@ -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 e99f81a099b50..14e85e32cc2da 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 ec744484e9276..21b500c2d5d1a 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. + */ /* @@ -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 (); @@ -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', @@ -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. + */ /* @@ -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. + */ /* @@ -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. + */ /* @@ -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 1194a6339ba64..a8505619e6b5e 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 913f38c45ea07..1dab1c27ceaaa 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 0ee74418fd451..9c00d21ae74ce 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 cdadd7249eda0..7098f2d447acd 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 e28f3c1f05b07..8dda5ab9284d0 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 a2030c77c0f98..0e6269806f72b 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 e01d28980d434..3d7571ecb4cf0 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 cb44d2c42f5b9..91098a59aa289 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 ea0562ff1a4f3..968ee1b5d0475 100644 --- a/lesskey.man +++ b/lesskey.man @@ -349,10 +349,8 @@ LESSKEY(1) LESSKEY(1) [1mAUTHOR[0m 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 1a066b96d77d8..4b6f2f4fb3a6b 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. @@ -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. + */ /* @@ -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 807eb30ac1538..4f45be8748fe0 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 1b3fa04e2f42d..674e5a28e18e4 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. + */ /* @@ -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. + */ /* @@ -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 94d189482b7d9..45530fd1c0365 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 b4288d78bb5b5..e3cd57f96d9cf 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 cf5ed36a72c57..22de61488e824 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 00b4b7d1fd623..c11ad3b4f0125 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 615fb2785c468..0146793658de8 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. + */ /* @@ -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 ba07421302480..bcc8471c861bc 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 606f28cb67e34..fa26b99379fc1 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 c91a2cc9c4417..7d05fdeb88e04 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 306ffde8992f9..b67375683088d 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 234dc94e3b5de..95183073d4c43 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 e0ab36059dc44..3b96637067efa 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 49361fa0c9276..f374101cfa386 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 132b3d7f9c993..688ba20ae868e 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 b9c7a492ba6eb..9f786fecbb9b8 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 f09c068a55919..24d4210a0135d 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 83dc764464626..7bf5b51919dfb 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. + */ /* @@ -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" @@ -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 096ae20667286..926e84067aed1 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"; |