Merge branch 'master' of https://github.com/gwsw/less

gwsw · Apr 23, 2024 · e98b228 · e98b228
2 parents 2a642a0 + 2ef383e
commit e98b228
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/NEWS b/NEWS
@@ -102,6 +102,10 @@
 
 * Fix wrong sleep time when system has usleep but not nanosleep (github #489).
 
+* Fix bug when file name contains a newline.
+
+* Fix DJGPP build (github #497).
+
 * Update Unicode tables.
 
 ======================================================================

diff --git a/less.nro.VER b/less.nro.VER
@@ -27,10 +27,8 @@ less \- display the contents of a file in a terminal
 .B Less
 is a program similar to
 .BR more (1),
-but which allows backward movement
-in the file as well as forward movement.
-Also,
-.B less
+but it has many more features.
+.B Less
 does not have to read the entire input file before starting,
 so with large input files it starts up faster than text editors like
 .BR vi (1).

diff --git a/search.c b/search.c
@@ -1268,7 +1268,7 @@ static lbool osc8_parse(constant char *line, constant char *line_end, struct osc
 
 	oline = line;
 	LWCHAR ch = step_charc(&line, +1, line_end);
-	/* oline points to charcter ch, line points to the one after it. */
+	/* oline points to character ch, line points to the one after it. */
 	struct ansi_state *pansi = ansi_start(ch);
 	if (pansi == NULL)
 		return FALSE;

diff --git a/tags.c b/tags.c
@@ -689,7 +689,7 @@ static POSITION gtagsearch(void)
  * |func     21      subr.c         func(arg)
  *
  * The following commands write this format.
- *      o Traditinal Ctags with -x option
+ *      o Traditional Ctags with -x option
  *      o Global with -x option
  *              See <http://www.gnu.org/software/global/global.html>
  *

diff --git a/version.c b/version.c
@@ -40,7 +40,7 @@ v19    5/2/85   Got rid of "verbose" eq_message().
 v20    5/21/85  Fixed screen.c ioctls for System V.
 v21    5/23/85  Fixed some first_cmd bugs.
 v22    5/24/85  Added support for no RECOMP nor REGCMP.
-v23    5/25/85  Miscellanous changes and prettying up.
+v23    5/25/85  Miscellaneous changes and prettying up.
                 Posted to USENET.
 -----------------------------------------------------------------
 v24    6/3/85   Added ti,te terminal init & de-init.       
@@ -628,7 +628,7 @@ v373  1/14/02   Improve handling of filenames containing shell metachars.
 v374   2/7/02   Fix memory leak; fix bug in -x argument parsing.
 v375   4/7/02   Fix searching for SGR sequences; fix SECURE build;
                 add SGR support to DJGPP version (thanks to Eli Zaretskii).
-v376  6/10/02   Fix bug in overstriking mulitbyte UTF-8 characters
+v376  6/10/02   Fix bug in overstriking multibyte UTF-8 characters
                 (thanks to Jungshik Shin).
                 Posted to Web page.
 -----------------------------------------------------------------
@@ -1012,7 +1012,8 @@ v651  3/4/24    Add --color attributes (*~_&); fix #/% substitution if name
                 contains spaces; allow --rscroll with non-ASCII char.
 v652  3/11/24   Fix sleep_ms with usleep.
 v653  3/20/24   Make default charset utf-8.
-v654
+v654            Allow space to end parameter for some options; fix usleep bug;
+                fix bug when filename contains \n; fix DJGPP build.
 */
 
 char version[] = "654x";