Merge from origin/emacs-26

2fcf2df Fix copyright years by hand 26bed8b Update copyright year to 2019 2814292 Fix value of default frame height. (Bug#33921)
author: Paul Eggert 2018-12-31 17:57:29 -0800
committer: Paul Eggert 2018-12-31 17:57:29 -0800
commit: ba809612c06bcabd05dcbaae79da39dcb0925992 (patch)
tree: 2e2047c81e96710011e49fc0e492d3c58df442b5 /lwlib
parent: d9ba26ec2d56e8407094571769c847b78e7c524e (diff)
parent: 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff)
download: emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz
emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.zip
14 files changed, 14 insertions, 14 deletions
diff --git a/lwlib/ChangeLog.1 b/lwlib/ChangeLog.1
index 375ab2ea9ef..e8f221043f3 100644
--- a/lwlib/ChangeLog.1
+++ b/lwlib/ChangeLog.1
@@ -1964,7 +1964,7 @@
 ;; coding: utf-8
 ;; End:
-  Copyright (C) 1995-1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1995-1999, 2001-2019 Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index ed71270a771..e1d92872732 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -1,7 +1,7 @@
 ### @configure_input@
 # Copyright (C) 1992, 1993 Lucid, Inc.
-# Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 #
 # This file is part of the Lucid Widget Library.
 #
diff --git a/lwlib/deps.mk b/lwlib/deps.mk
index 675832ed439..f5097eaaa86 100644
--- a/lwlib/deps.mk
+++ b/lwlib/deps.mk
@@ -1,7 +1,7 @@
 ### deps.mk --- lwlib/Makefile fragment for GNU Emacs
 # Copyright (C) 1992, 1993 Lucid, Inc.
-# Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 #
 # This file is part of the Lucid Widget Library.
 #
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index bc1c18dd464..24b31fc2956 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -1,7 +1,7 @@
 /* The lwlib interface to Athena widgets.
 Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
-Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index bcbc7e924f4..621d1e70f38 100644
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -1,7 +1,7 @@
 /* The lwlib interface to "xlwmenu" menus.
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 1994, 2000-2018 Free Software Foundation, Inc.
+Copyright (C) 1994, 2000-2019 Free Software Foundation, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 43db998a048..b6d21a65e28 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -1,6 +1,6 @@
 /* The lwlib interface to Motif widgets.
-Copyright (C) 1994-1997, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1994-1997, 1999-2019 Free Software Foundation, Inc.
 Copyright (C) 1992 Lucid, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/lwlib-int.h b/lwlib/lwlib-int.h
index 73c9a88602f..e21fa1f1714 100644
--- a/lwlib/lwlib-int.h
+++ b/lwlib/lwlib-int.h
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 2000-2018 Free Software Foundation, Inc.
+Copyright (C) 2000-2019 Free Software Foundation, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index 5e579d1e20f..7c60bdb056d 100644
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -1,7 +1,7 @@
 /* Defines some widget utility functions.
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/lwlib-widget.h b/lwlib/lwlib-widget.h
index 6805d680b83..4b842d5022f 100644
--- a/lwlib/lwlib-widget.h
+++ b/lwlib/lwlib-widget.h
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 1992, 1993 Lucid, Inc.
-Copyright (C) 1994, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1994, 1999-2019 Free Software Foundation, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 4bb5e4a7627..8142d92f077 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -1,7 +1,7 @@
 /* A general interface to the widgets of different toolkits.
 Copyright (C) 1992, 1993 Lucid, Inc.
-Copyright (C) 1994-1996, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2019 Free Software Foundation, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h
index 41d3e0139d2..c0f20ae792b 100644
--- a/lwlib/lwlib.h
+++ b/lwlib/lwlib.h
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 1992, 1993 Lucid, Inc.
-Copyright (C) 1994, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1994, 1999-2019 Free Software Foundation, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 20a868d3e07..07ad29e1072 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1,7 +1,7 @@
 /* Implements a lightweight menubar widget.
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 1994-1995, 1997, 1999-2018 Free Software Foundation, Inc.
+Copyright (C) 1994-1995, 1997, 1999-2019 Free Software Foundation, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index a5cea0c6fb2..c37c83ae998 100644
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -1,6 +1,6 @@
 /* Interface of a lightweight menubar widget.
-Copyright (C) 2002-2018 Free Software Foundation, Inc.
+Copyright (C) 2002-2019 Free Software Foundation, Inc.
 Copyright (C) 1992 Lucid, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index 4f35d60b944..610f83afe45 100644
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,6 +1,6 @@
 /* Internals of a lightweight menubar widget.
-Copyright (C) 2002-2018 Free Software Foundation, Inc.
+Copyright (C) 2002-2019 Free Software Foundation, Inc.
 Copyright (C) 1992 Lucid, Inc.
 This file is part of the Lucid Widget Library.
author	Paul Eggert	2018-12-31 17:57:29 -0800
committer	Paul Eggert	2018-12-31 17:57:29 -0800
commit	ba809612c06bcabd05dcbaae79da39dcb0925992 (patch)
tree	2e2047c81e96710011e49fc0e492d3c58df442b5 /lwlib
parent	d9ba26ec2d56e8407094571769c847b78e7c524e (diff)
parent	2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff)
download	emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.zip

diff --git a/lwlib/ChangeLog.1 b/lwlib/ChangeLog.1 index 375ab2ea9ef..e8f221043f3 100644 --- a/lwlib/ChangeLog.1 +++ b/lwlib/ChangeLog.1
@@ -1964,7 +1964,7 @@
1964	;; coding: utf-8	1964	;; coding: utf-8
1965	;; End:	1965	;; End:
1966		1966
1967	Copyright (C) 1995-1999, 2001-2018 Free Software Foundation, Inc.	1967	Copyright (C) 1995-1999, 2001-2019 Free Software Foundation, Inc.
1968		1968
1969	This file is part of GNU Emacs.	1969	This file is part of GNU Emacs.
1970		1970


diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index ed71270a771..e1d92872732 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in
@@ -1,7 +1,7 @@
1	### @configure_input@	1	### @configure_input@
2		2
3	# Copyright (C) 1992, 1993 Lucid, Inc.	3	# Copyright (C) 1992, 1993 Lucid, Inc.
4	# Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.	4	# Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
5	#	5	#
6	# This file is part of the Lucid Widget Library.	6	# This file is part of the Lucid Widget Library.
7	#	7	#


diff --git a/lwlib/deps.mk b/lwlib/deps.mk index 675832ed439..f5097eaaa86 100644 --- a/lwlib/deps.mk +++ b/lwlib/deps.mk
@@ -1,7 +1,7 @@
1	### deps.mk --- lwlib/Makefile fragment for GNU Emacs	1	### deps.mk --- lwlib/Makefile fragment for GNU Emacs
2		2
3	# Copyright (C) 1992, 1993 Lucid, Inc.	3	# Copyright (C) 1992, 1993 Lucid, Inc.
4	# Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.	4	# Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
5	#	5	#
6	# This file is part of the Lucid Widget Library.	6	# This file is part of the Lucid Widget Library.
7	#	7	#


diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c index bc1c18dd464..24b31fc2956 100644 --- a/lwlib/lwlib-Xaw.c +++ b/lwlib/lwlib-Xaw.c
@@ -1,7 +1,7 @@
1	/* The lwlib interface to Athena widgets.	1	/* The lwlib interface to Athena widgets.
2		2
3	Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>	3	Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
4	Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.	4	Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
5		5
6	This file is part of the Lucid Widget Library.	6	This file is part of the Lucid Widget Library.
7		7


diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c index bcbc7e924f4..621d1e70f38 100644 --- a/lwlib/lwlib-Xlw.c +++ b/lwlib/lwlib-Xlw.c
@@ -1,7 +1,7 @@
1	/* The lwlib interface to "xlwmenu" menus.	1	/* The lwlib interface to "xlwmenu" menus.
2		2
3	Copyright (C) 1992 Lucid, Inc.	3	Copyright (C) 1992 Lucid, Inc.
4	Copyright (C) 1994, 2000-2018 Free Software Foundation, Inc.	4	Copyright (C) 1994, 2000-2019 Free Software Foundation, Inc.
5		5
6	This file is part of the Lucid Widget Library.	6	This file is part of the Lucid Widget Library.
7		7


diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index 43db998a048..b6d21a65e28 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c
@@ -1,6 +1,6 @@
1	/* The lwlib interface to Motif widgets.	1	/* The lwlib interface to Motif widgets.
2		2
3	Copyright (C) 1994-1997, 1999-2018 Free Software Foundation, Inc.	3	Copyright (C) 1994-1997, 1999-2019 Free Software Foundation, Inc.
4	Copyright (C) 1992 Lucid, Inc.	4	Copyright (C) 1992 Lucid, Inc.
5		5
6	This file is part of the Lucid Widget Library.	6	This file is part of the Lucid Widget Library.


diff --git a/lwlib/lwlib-int.h b/lwlib/lwlib-int.h index 73c9a88602f..e21fa1f1714 100644 --- a/lwlib/lwlib-int.h +++ b/lwlib/lwlib-int.h
@@ -1,6 +1,6 @@
1	/*	1	/*
2	Copyright (C) 1992 Lucid, Inc.	2	Copyright (C) 1992 Lucid, Inc.
3	Copyright (C) 2000-2018 Free Software Foundation, Inc.	3	Copyright (C) 2000-2019 Free Software Foundation, Inc.
4		4
5	This file is part of the Lucid Widget Library.	5	This file is part of the Lucid Widget Library.
6		6


diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c index 5e579d1e20f..7c60bdb056d 100644 --- a/lwlib/lwlib-utils.c +++ b/lwlib/lwlib-utils.c
@@ -1,7 +1,7 @@
1	/* Defines some widget utility functions.	1	/* Defines some widget utility functions.
2		2
3	Copyright (C) 1992 Lucid, Inc.	3	Copyright (C) 1992 Lucid, Inc.
4	Copyright (C) 1994, 2001-2018 Free Software Foundation, Inc.	4	Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
5		5
6	This file is part of the Lucid Widget Library.	6	This file is part of the Lucid Widget Library.
7		7


diff --git a/lwlib/lwlib-widget.h b/lwlib/lwlib-widget.h index 6805d680b83..4b842d5022f 100644 --- a/lwlib/lwlib-widget.h +++ b/lwlib/lwlib-widget.h
@@ -1,6 +1,6 @@
1	/*	1	/*
2	Copyright (C) 1992, 1993 Lucid, Inc.	2	Copyright (C) 1992, 1993 Lucid, Inc.
3	Copyright (C) 1994, 1999-2018 Free Software Foundation, Inc.	3	Copyright (C) 1994, 1999-2019 Free Software Foundation, Inc.
4		4
5	This file is part of the Lucid Widget Library.	5	This file is part of the Lucid Widget Library.
6		6


diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index 4bb5e4a7627..8142d92f077 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c
@@ -1,7 +1,7 @@
1	/* A general interface to the widgets of different toolkits.	1	/* A general interface to the widgets of different toolkits.
2		2
3	Copyright (C) 1992, 1993 Lucid, Inc.	3	Copyright (C) 1992, 1993 Lucid, Inc.
4	Copyright (C) 1994-1996, 1999-2018 Free Software Foundation, Inc.	4	Copyright (C) 1994-1996, 1999-2019 Free Software Foundation, Inc.
5		5
6	This file is part of the Lucid Widget Library.	6	This file is part of the Lucid Widget Library.
7		7


diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h index 41d3e0139d2..c0f20ae792b 100644 --- a/lwlib/lwlib.h +++ b/lwlib/lwlib.h
@@ -1,6 +1,6 @@
1	/*	1	/*
2	Copyright (C) 1992, 1993 Lucid, Inc.	2	Copyright (C) 1992, 1993 Lucid, Inc.
3	Copyright (C) 1994, 1999-2018 Free Software Foundation, Inc.	3	Copyright (C) 1994, 1999-2019 Free Software Foundation, Inc.
4		4
5	This file is part of the Lucid Widget Library.	5	This file is part of the Lucid Widget Library.
6		6


diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 20a868d3e07..07ad29e1072 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c
@@ -1,7 +1,7 @@
1	/* Implements a lightweight menubar widget.	1	/* Implements a lightweight menubar widget.
2		2
3	Copyright (C) 1992 Lucid, Inc.	3	Copyright (C) 1992 Lucid, Inc.
4	Copyright (C) 1994-1995, 1997, 1999-2018 Free Software Foundation, Inc.	4	Copyright (C) 1994-1995, 1997, 1999-2019 Free Software Foundation, Inc.
5		5
6	This file is part of the Lucid Widget Library.	6	This file is part of the Lucid Widget Library.
7		7


diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h index a5cea0c6fb2..c37c83ae998 100644 --- a/lwlib/xlwmenu.h +++ b/lwlib/xlwmenu.h
@@ -1,6 +1,6 @@
1	/* Interface of a lightweight menubar widget.	1	/* Interface of a lightweight menubar widget.
2		2
3	Copyright (C) 2002-2018 Free Software Foundation, Inc.	3	Copyright (C) 2002-2019 Free Software Foundation, Inc.
4	Copyright (C) 1992 Lucid, Inc.	4	Copyright (C) 1992 Lucid, Inc.
5		5
6	This file is part of the Lucid Widget Library.	6	This file is part of the Lucid Widget Library.


diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h index 4f35d60b944..610f83afe45 100644 --- a/lwlib/xlwmenuP.h +++ b/lwlib/xlwmenuP.h
@@ -1,6 +1,6 @@
1	/* Internals of a lightweight menubar widget.	1	/* Internals of a lightweight menubar widget.
2		2
3	Copyright (C) 2002-2018 Free Software Foundation, Inc.	3	Copyright (C) 2002-2019 Free Software Foundation, Inc.
4	Copyright (C) 1992 Lucid, Inc.	4	Copyright (C) 1992 Lucid, Inc.
5		5
6	This file is part of the Lucid Widget Library.	6	This file is part of the Lucid Widget Library.