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 /oldXMenu
parent: d9ba26ec2d56e8407094571769c847b78e7c524e (diff)
parent: 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff)
download: emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz
emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.zip
8 files changed, 8 insertions, 8 deletions
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 8a35e6e90ae..a0d1f70b9d0 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/oldXMenu/ChangeLog.1 b/oldXMenu/ChangeLog.1
index 44387d1635e..0e76897710b 100644
--- a/oldXMenu/ChangeLog.1
+++ b/oldXMenu/ChangeLog.1
@@ -712,7 +712,7 @@
 ;; coding: utf-8
 ;; End:
-  Copyright (C) 1993-1999, 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2019 Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index c60bc5f7c5a..2ea84e921a1 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c
index 2b3d28144cf..af084104ca4 100644
--- a/oldXMenu/FindSel.c
+++ b/oldXMenu/FindSel.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index 912cb7d2691..074e4f98b94 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 1993, 1996, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1993, 1996, 2001-2019 Free Software Foundation, Inc.
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 211bac97ee4..db76e7420dd 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -15,7 +15,7 @@
 ## without express or implied warranty.
-## Copyright (C) 2001-2018 Free Software Foundation, Inc.
+## Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/oldXMenu/deps.mk b/oldXMenu/deps.mk
index 55d0243ba91..f5e3a255e86 100644
--- a/oldXMenu/deps.mk
+++ b/oldXMenu/deps.mk
@@ -15,7 +15,7 @@
 ## without express or implied warranty.
-## Copyright (C) 2001-2018 Free Software Foundation, Inc.
+## Copyright (C) 2001-2019 Free Software Foundation, Inc.
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c
index 1a77906ce55..4732bcedd41 100644
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 1993-1998, 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 1993-1998, 2001-2019 Free Software Foundation, Inc.
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
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 /oldXMenu
parent	d9ba26ec2d56e8407094571769c847b78e7c524e (diff)
parent	2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff)
download	emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.zip

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c index 8a35e6e90ae..a0d1f70b9d0 100644 --- a/oldXMenu/Activate.c +++ b/oldXMenu/Activate.c
@@ -3,7 +3,7 @@
3	#include "copyright.h"	3	#include "copyright.h"
4		4
5	/*	5	/*
6	Copyright (C) 2001-2018 Free Software Foundation, Inc.	6	Copyright (C) 2001-2019 Free Software Foundation, Inc.
7		7
8	This program is free software: you can redistribute it and/or modify	8	This program is free software: you can redistribute it and/or modify
9	it under the terms of the GNU General Public License as published by	9	it under the terms of the GNU General Public License as published by


diff --git a/oldXMenu/ChangeLog.1 b/oldXMenu/ChangeLog.1 index 44387d1635e..0e76897710b 100644 --- a/oldXMenu/ChangeLog.1 +++ b/oldXMenu/ChangeLog.1
@@ -712,7 +712,7 @@
712	;; coding: utf-8	712	;; coding: utf-8
713	;; End:	713	;; End:
714		714
715	Copyright (C) 1993-1999, 2001-2018 Free Software Foundation, Inc.	715	Copyright (C) 1993-1999, 2001-2019 Free Software Foundation, Inc.
716		716
717	This file is part of GNU Emacs.	717	This file is part of GNU Emacs.
718		718


diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c index c60bc5f7c5a..2ea84e921a1 100644 --- a/oldXMenu/Create.c +++ b/oldXMenu/Create.c
@@ -3,7 +3,7 @@
3	#include "copyright.h"	3	#include "copyright.h"
4		4
5	/*	5	/*
6	Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.	6	Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
7		7
8	This program is free software: you can redistribute it and/or modify	8	This program is free software: you can redistribute it and/or modify
9	it under the terms of the GNU General Public License as published by	9	it under the terms of the GNU General Public License as published by


diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c index 2b3d28144cf..af084104ca4 100644 --- a/oldXMenu/FindSel.c +++ b/oldXMenu/FindSel.c
@@ -3,7 +3,7 @@
3	#include "copyright.h"	3	#include "copyright.h"
4		4
5	/*	5	/*
6	Copyright (C) 2001-2018 Free Software Foundation, Inc.	6	Copyright (C) 2001-2019 Free Software Foundation, Inc.
7		7
8	This program is free software: you can redistribute it and/or modify	8	This program is free software: you can redistribute it and/or modify
9	it under the terms of the GNU General Public License as published by	9	it under the terms of the GNU General Public License as published by


diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c index 912cb7d2691..074e4f98b94 100644 --- a/oldXMenu/Internal.c +++ b/oldXMenu/Internal.c
@@ -3,7 +3,7 @@
3	#include "copyright.h"	3	#include "copyright.h"
4		4
5	/*	5	/*
6	Copyright (C) 1993, 1996, 2001-2018 Free Software Foundation, Inc.	6	Copyright (C) 1993, 1996, 2001-2019 Free Software Foundation, Inc.
7		7
8	This program is free software: you can redistribute it and/or modify	8	This program is free software: you can redistribute it and/or modify
9	it under the terms of the GNU General Public License as published by	9	it under the terms of the GNU General Public License as published by


diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index 211bac97ee4..db76e7420dd 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in
@@ -15,7 +15,7 @@
15	## without express or implied warranty.	15	## without express or implied warranty.
16		16
17		17
18	## Copyright (C) 2001-2018 Free Software Foundation, Inc.	18	## Copyright (C) 2001-2019 Free Software Foundation, Inc.
19		19
20	## This program is free software: you can redistribute it and/or modify	20	## This program is free software: you can redistribute it and/or modify
21	## it under the terms of the GNU General Public License as published by	21	## it under the terms of the GNU General Public License as published by


diff --git a/oldXMenu/deps.mk b/oldXMenu/deps.mk index 55d0243ba91..f5e3a255e86 100644 --- a/oldXMenu/deps.mk +++ b/oldXMenu/deps.mk
@@ -15,7 +15,7 @@
15	## without express or implied warranty.	15	## without express or implied warranty.
16		16
17		17
18	## Copyright (C) 2001-2018 Free Software Foundation, Inc.	18	## Copyright (C) 2001-2019 Free Software Foundation, Inc.
19		19
20	## This program is free software: you can redistribute it and/or modify	20	## This program is free software: you can redistribute it and/or modify
21	## it under the terms of the GNU General Public License as published by	21	## it under the terms of the GNU General Public License as published by


diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c index 1a77906ce55..4732bcedd41 100644 --- a/oldXMenu/insque.c +++ b/oldXMenu/insque.c
@@ -1,5 +1,5 @@
1	/*	1	/*
2	Copyright (C) 1993-1998, 2001-2018 Free Software Foundation, Inc.	2	Copyright (C) 1993-1998, 2001-2019 Free Software Foundation, Inc.
3		3
4	This program is free software: you can redistribute it and/or modify	4	This program is free software: you can redistribute it and/or modify
5	it under the terms of the GNU General Public License as published by	5	it under the terms of the GNU General Public License as published by