Merge from HEAD@222975.

13 files changed, 23 insertions, 45 deletions

diff --git a/contrib/less/NEWS b/contrib/less/NEWS
index 4beefaf..eb38025 100644
--- a/contrib/less/NEWS
+++ b/contrib/less/NEWS
@@ -12,6 +12,15 @@
 
 ======================================================================
 
+	Major changes between "less" versions 443 and 444
+
+* Fix bug in unget handling that can cause strange effects on the
+  command line.
+
+* Remove vestiges of obsolete -l option that can cause a crash.
+
+======================================================================
+
 	Major changes between "less" versions 436 and 443
 
 * Change search behavior such that when a search is given an explicit 
diff --git a/contrib/less/README b/contrib/less/README
index 8d5a95b..ba6f269 100644
--- a/contrib/less/README
+++ b/contrib/less/README
@@ -7,9 +7,9 @@
 **************************************************************************
 **************************************************************************
 
-                            Less, version 443
+                            Less, version 444
 
-    This is the distribution of less, version 443, released 09 Apr 2011.
+    This is the distribution of less, version 444, released 09 Jun 2011.
     This program is part of the GNU project (http://www.gnu.org).
 
     This program is free software.  You may redistribute it and/or
diff --git a/contrib/less/command.c b/contrib/less/command.c
index 653db0b..41c3869 100644
--- a/contrib/less/command.c
+++ b/contrib/less/command.c
@@ -302,7 +302,7 @@ is_erase_char(c)
  */
 	static int
 mca_opt_first_char(c)
-	int c;
+    int c;
 {
 	int flag = (optflag & ~OPT_NO_PROMPT);
 	if (flag == OPT_NO_TOGGLE)
@@ -846,6 +846,7 @@ ungetcc(c)
 	ug->ug_char = c;
 	ug->ug_next = ungot;
 	ungot = ug;
+	unget_end = 0;
 }
 
 /*
diff --git a/contrib/less/funcs.h b/contrib/less/funcs.h
index 8464ada..6595232 100644
--- a/contrib/less/funcs.h
+++ b/contrib/less/funcs.h
@@ -194,7 +194,6 @@
 	public void unmark ();
 	public void opt_o ();
 	public void opt__O ();
-	public void opt_l ();
 	public void opt_j ();
 	public void calc_jump_sline ();
 	public void opt_shift ();
diff --git a/contrib/less/less.man b/contrib/less/less.man
index 86e329c..a54609d 100644
--- a/contrib/less/less.man
+++ b/contrib/less/less.man
@@ -1156,7 +1156,7 @@ LESS(1)                                                                LESS(1)
             next      8bcccbcc18b95.bb125.bb
 
        If neither LESSCHARSET nor LESSCHARDEF is set, but any of  the  strings
-       "UTF-8",  "UTF8",  "utf-8" or "utf8" is found in the LC_ALL, LC_TYPE or
+       "UTF-8",  "UTF8", "utf-8" or "utf8" is found in the LC_ALL, LC_CTYPE or
        LANG environment variables, then the default character set is utf-8.
 
        If that string is not found, but your  system  supports  the  setlocale
@@ -1580,4 +1580,4 @@ LESS(1)                                                                LESS(1)
 
 
 
-                           Version 443: 09 Apr 2011                    LESS(1)
+                           Version 444: 09 Jun 2011                    LESS(1)
diff --git a/contrib/less/less.nro b/contrib/less/less.nro
index 33050e1..0bc21b5 100644
--- a/contrib/less/less.nro
+++ b/contrib/less/less.nro
@@ -1,4 +1,4 @@
-.TH LESS 1 "Version 443: 09 Apr 2011"
+.TH LESS 1 "Version 444: 09 Jun 2011"
 .SH NAME
 less \- opposite of more
 .SH SYNOPSIS
@@ -1276,7 +1276,7 @@ to each of the possible values for LESSCHARSET:
 .PP
 If neither LESSCHARSET nor LESSCHARDEF is set,
 but any of the strings "UTF-8", "UTF8", "utf-8" or "utf8" 
-is found in the LC_ALL, LC_TYPE or LANG
+is found in the LC_ALL, LC_CTYPE or LANG
 environment variables, then the default character set is utf-8.
 .PP
 If that string is not found, but your system supports the
diff --git a/contrib/less/lessecho.man b/contrib/less/lessecho.man
index 32bccba..682b0bd 100644
--- a/contrib/less/lessecho.man
+++ b/contrib/less/lessecho.man
@@ -46,4 +46,4 @@ LESSECHO(1)                                                        LESSECHO(1)
 
 
 
-                           Version 443: 09 Apr 2011                LESSECHO(1)
+                           Version 444: 09 Jun 2011                LESSECHO(1)
diff --git a/contrib/less/lessecho.nro b/contrib/less/lessecho.nro
index 5c17708..46540e8 100644
--- a/contrib/less/lessecho.nro
+++ b/contrib/less/lessecho.nro
@@ -1,4 +1,4 @@
-.TH LESSECHO 1 "Version 443: 09 Apr 2011"
+.TH LESSECHO 1 "Version 444: 09 Jun 2011"
 .SH NAME
 lessecho \- expand metacharacters
 .SH SYNOPSIS
diff --git a/contrib/less/lesskey.man b/contrib/less/lesskey.man
index b315ea6..5e0a999 100644
--- a/contrib/less/lesskey.man
+++ b/contrib/less/lesskey.man
@@ -354,4 +354,4 @@ LESSKEY(1)                                                          LESSKEY(1)
 
 
 
-                           Version 443: 09 Apr 2011                 LESSKEY(1)
+                           Version 444: 09 Jun 2011                 LESSKEY(1)
diff --git a/contrib/less/lesskey.nro b/contrib/less/lesskey.nro
index 8c99a0f..d305b95 100644
--- a/contrib/less/lesskey.nro
+++ b/contrib/less/lesskey.nro
@@ -1,4 +1,4 @@
-.TH LESSKEY 1 "Version 443: 09 Apr 2011"
+.TH LESSKEY 1 "Version 444: 09 Jun 2011"
 .SH NAME
 lesskey \- specify key bindings for less
 .SH SYNOPSIS
diff --git a/contrib/less/optfunc.c b/contrib/less/optfunc.c
index 79ac7c6..a0aa10a 100644
--- a/contrib/less/optfunc.c
+++ b/contrib/less/optfunc.c
@@ -132,34 +132,6 @@ opt__O(type, s)
 #endif
 
 /*
- * Handlers for -l option.
- */
-	public void
-opt_l(type, s)
-	int type;
-	char *s;
-{
-	int err;
-	int n;
-	char *t;
-	
-	switch (type)
-	{
-	case INIT:
-		t = s;
-		n = getnum(&t, "l", &err);
-		if (err || n <= 0)
-		{
-			error("Line number is required after -l", NULL_PARG);
-			return;
-		}
-		plusoption = TRUE;
-		ungetsc(s);
-		break;
-	}
-}
-
-/*
  * Handlers for -j option.
  */
 	public void
diff --git a/contrib/less/opttbl.c b/contrib/less/opttbl.c
index d1c60a2..63f6889 100644
--- a/contrib/less/opttbl.c
+++ b/contrib/less/opttbl.c
@@ -263,10 +263,6 @@ static struct loption option[] =
 			NULL
 		}
 	},
-	{ 'l', NULL,
-		STRING|NO_TOGGLE|NO_QUERY, 0, NULL, opt_l,
-		{ NULL, NULL, NULL }
-	},
 	{ 'L', &L__optname,
 		BOOL, OPT_ON, &use_lessopen, NULL,
 		{
diff --git a/contrib/less/version.c b/contrib/less/version.c
index be75d20..dc5bb0c 100644
--- a/contrib/less/version.c
+++ b/contrib/less/version.c
@@ -742,6 +742,7 @@ v441  1/21/11   Fix semi-infinite loop if no newlines in file;
 v442  3/2/11    Fix search bug.
                 Add ctrl-G line edit command.
 v443  4/9/11    Fix Windows build.
+v444  6/8/11    Fix ungetc bug; remove vestiges of obsolete -l option.
 */
 
-char version[] = "443";
+char version[] = "444";