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 /doc/lispintro
parent: d9ba26ec2d56e8407094571769c847b78e7c524e (diff)
parent: 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff)
download: emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz
emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.zip
14 files changed, 14 insertions, 14 deletions
diff --git a/doc/lispintro/ChangeLog.1 b/doc/lispintro/ChangeLog.1
index 9e15544630c..2df76f4e029 100644
--- a/doc/lispintro/ChangeLog.1
+++ b/doc/lispintro/ChangeLog.1
@@ -782,7 +782,7 @@
 ;; coding: utf-8
 ;; End:
-  Copyright (C) 2001-2018 Free Software Foundation, Inc.
+  Copyright (C) 2001-2019 Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index e2a1229d5ca..37fffb8a0f2 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -1,6 +1,6 @@
 ### @configure_input@
-# Copyright (C) 1994-1999, 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-1999, 2001-2019 Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/doc/lispintro/README b/doc/lispintro/README
index c39f6d2402a..fd4ede1dfa0 100644
--- a/doc/lispintro/README
+++ b/doc/lispintro/README
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2019 Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/doc/lispintro/cons-1.eps b/doc/lispintro/cons-1.eps
index cc1d5c7c409..dff7130952e 100644
--- a/doc/lispintro/cons-1.eps
+++ b/doc/lispintro/cons-1.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:26:58 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
-% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/cons-2.eps b/doc/lispintro/cons-2.eps
index 00d08e423d9..ccba32056ab 100644
--- a/doc/lispintro/cons-2.eps
+++ b/doc/lispintro/cons-2.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:26:39 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
-% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/cons-2a.eps b/doc/lispintro/cons-2a.eps
index 26f690a1435..3beaa5b640b 100644
--- a/doc/lispintro/cons-2a.eps
+++ b/doc/lispintro/cons-2a.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Tue Mar 14 15:09:30 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
-% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/cons-3.eps b/doc/lispintro/cons-3.eps
index d75620e28e4..6bae8f74116 100644
--- a/doc/lispintro/cons-3.eps
+++ b/doc/lispintro/cons-3.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:25:41 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
-% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/cons-4.eps b/doc/lispintro/cons-4.eps
index 154df88e531..fd056b55196 100644
--- a/doc/lispintro/cons-4.eps
+++ b/doc/lispintro/cons-4.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:25:06 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
-% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/cons-5.eps b/doc/lispintro/cons-5.eps
index d5c08ac1635..d3f7581eab9 100644
--- a/doc/lispintro/cons-5.eps
+++ b/doc/lispintro/cons-5.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:27:28 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
-% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps
index e3a7f0a7dd2..4569b21fde9 100644
--- a/doc/lispintro/drawers.eps
+++ b/doc/lispintro/drawers.eps
@@ -9,7 +9,7 @@
 %%EndComments
 %%BeginProlog
-% Copyright (C) 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 2001-2019 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 2587d0d84f7..f292a1759fc 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -113,7 +113,7 @@ Edition @value{edition-number}, @value{update-date}
 Distributed with Emacs version @value{EMACSVER}.
 @end ifnottex
 @sp 1
-Copyright @copyright{} 1990--1995, 1997, 2001--2018 Free Software
+Copyright @copyright{} 1990--1995, 1997, 2001--2019 Free Software
 Foundation, Inc.
 @sp 1
diff --git a/doc/lispintro/lambda-1.eps b/doc/lispintro/lambda-1.eps
index 4b6d8275cb5..a78a60cb42f 100644
--- a/doc/lispintro/lambda-1.eps
+++ b/doc/lispintro/lambda-1.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:31:53 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
-% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/lambda-2.eps b/doc/lispintro/lambda-2.eps
index 473785c81af..a7c2e7b830b 100644
--- a/doc/lispintro/lambda-2.eps
+++ b/doc/lispintro/lambda-2.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:33:09 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
-% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/lambda-3.eps b/doc/lispintro/lambda-3.eps
index c1a251682f8..d73a9d69104 100644
--- a/doc/lispintro/lambda-3.eps
+++ b/doc/lispintro/lambda-3.eps
@@ -4,7 +4,7 @@
 %%CreationDate: Wed Mar  8 14:33:49 1995
 %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
-% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.
+% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
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 /doc/lispintro
parent	d9ba26ec2d56e8407094571769c847b78e7c524e (diff)
parent	2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff)
download	emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.zip

diff --git a/doc/lispintro/ChangeLog.1 b/doc/lispintro/ChangeLog.1 index 9e15544630c..2df76f4e029 100644 --- a/doc/lispintro/ChangeLog.1 +++ b/doc/lispintro/ChangeLog.1
@@ -782,7 +782,7 @@
782	;; coding: utf-8	782	;; coding: utf-8
783	;; End:	783	;; End:
784		784
785	Copyright (C) 2001-2018 Free Software Foundation, Inc.	785	Copyright (C) 2001-2019 Free Software Foundation, Inc.
786		786
787	This file is part of GNU Emacs.	787	This file is part of GNU Emacs.
788		788


diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index e2a1229d5ca..37fffb8a0f2 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in
@@ -1,6 +1,6 @@
1	### @configure_input@	1	### @configure_input@
2		2
3	# Copyright (C) 1994-1999, 2001-2018 Free Software Foundation, Inc.	3	# Copyright (C) 1994-1999, 2001-2019 Free Software Foundation, Inc.
4		4
5	# This file is part of GNU Emacs.	5	# This file is part of GNU Emacs.
6		6


diff --git a/doc/lispintro/README b/doc/lispintro/README index c39f6d2402a..fd4ede1dfa0 100644 --- a/doc/lispintro/README +++ b/doc/lispintro/README
@@ -1,4 +1,4 @@
1	Copyright (C) 2001-2018 Free Software Foundation, Inc.	1	Copyright (C) 2001-2019 Free Software Foundation, Inc.
2	See the end of the file for license conditions.	2	See the end of the file for license conditions.
3		3
4		4


diff --git a/doc/lispintro/cons-1.eps b/doc/lispintro/cons-1.eps index cc1d5c7c409..dff7130952e 100644 --- a/doc/lispintro/cons-1.eps +++ b/doc/lispintro/cons-1.eps
@@ -4,7 +4,7 @@
4	%%CreationDate: Wed Mar 8 14:26:58 1995	4	%%CreationDate: Wed Mar 8 14:26:58 1995
5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)	5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
6		6
7	% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.	7	% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
8	%	8	%
9	% This file is part of GNU Emacs.	9	% This file is part of GNU Emacs.
10	%	10	%


diff --git a/doc/lispintro/cons-2.eps b/doc/lispintro/cons-2.eps index 00d08e423d9..ccba32056ab 100644 --- a/doc/lispintro/cons-2.eps +++ b/doc/lispintro/cons-2.eps
@@ -4,7 +4,7 @@
4	%%CreationDate: Wed Mar 8 14:26:39 1995	4	%%CreationDate: Wed Mar 8 14:26:39 1995
5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)	5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
6		6
7	% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.	7	% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
8	%	8	%
9	% This file is part of GNU Emacs.	9	% This file is part of GNU Emacs.
10	%	10	%


diff --git a/doc/lispintro/cons-2a.eps b/doc/lispintro/cons-2a.eps index 26f690a1435..3beaa5b640b 100644 --- a/doc/lispintro/cons-2a.eps +++ b/doc/lispintro/cons-2a.eps
@@ -4,7 +4,7 @@
4	%%CreationDate: Tue Mar 14 15:09:30 1995	4	%%CreationDate: Tue Mar 14 15:09:30 1995
5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)	5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
6		6
7	% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.	7	% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
8	%	8	%
9	% This file is part of GNU Emacs.	9	% This file is part of GNU Emacs.
10	%	10	%


diff --git a/doc/lispintro/cons-3.eps b/doc/lispintro/cons-3.eps index d75620e28e4..6bae8f74116 100644 --- a/doc/lispintro/cons-3.eps +++ b/doc/lispintro/cons-3.eps
@@ -4,7 +4,7 @@
4	%%CreationDate: Wed Mar 8 14:25:41 1995	4	%%CreationDate: Wed Mar 8 14:25:41 1995
5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)	5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
6		6
7	% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.	7	% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
8	%	8	%
9	% This file is part of GNU Emacs.	9	% This file is part of GNU Emacs.
10	%	10	%


diff --git a/doc/lispintro/cons-4.eps b/doc/lispintro/cons-4.eps index 154df88e531..fd056b55196 100644 --- a/doc/lispintro/cons-4.eps +++ b/doc/lispintro/cons-4.eps
@@ -4,7 +4,7 @@
4	%%CreationDate: Wed Mar 8 14:25:06 1995	4	%%CreationDate: Wed Mar 8 14:25:06 1995
5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)	5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
6		6
7	% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.	7	% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
8	%	8	%
9	% This file is part of GNU Emacs.	9	% This file is part of GNU Emacs.
10	%	10	%


diff --git a/doc/lispintro/cons-5.eps b/doc/lispintro/cons-5.eps index d5c08ac1635..d3f7581eab9 100644 --- a/doc/lispintro/cons-5.eps +++ b/doc/lispintro/cons-5.eps
@@ -4,7 +4,7 @@
4	%%CreationDate: Wed Mar 8 14:27:28 1995	4	%%CreationDate: Wed Mar 8 14:27:28 1995
5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)	5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
6		6
7	% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.	7	% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
8	%	8	%
9	% This file is part of GNU Emacs.	9	% This file is part of GNU Emacs.
10	%	10	%


diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps index e3a7f0a7dd2..4569b21fde9 100644 --- a/doc/lispintro/drawers.eps +++ b/doc/lispintro/drawers.eps
@@ -9,7 +9,7 @@
9	%%EndComments	9	%%EndComments
10	%%BeginProlog	10	%%BeginProlog
11		11
12	% Copyright (C) 2001-2018 Free Software Foundation, Inc.	12	% Copyright (C) 2001-2019 Free Software Foundation, Inc.
13	%	13	%
14	% This file is part of GNU Emacs.	14	% This file is part of GNU Emacs.
15	%	15	%


diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 2587d0d84f7..f292a1759fc 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -113,7 +113,7 @@ Edition @value{edition-number}, @value{update-date}
113	Distributed with Emacs version @value{EMACSVER}.	113	Distributed with Emacs version @value{EMACSVER}.
114	@end ifnottex	114	@end ifnottex
115	@sp 1	115	@sp 1
116	Copyright @copyright{} 1990--1995, 1997, 2001--2018 Free Software	116	Copyright @copyright{} 1990--1995, 1997, 2001--2019 Free Software
117	Foundation, Inc.	117	Foundation, Inc.
118	@sp 1	118	@sp 1
119		119


diff --git a/doc/lispintro/lambda-1.eps b/doc/lispintro/lambda-1.eps index 4b6d8275cb5..a78a60cb42f 100644 --- a/doc/lispintro/lambda-1.eps +++ b/doc/lispintro/lambda-1.eps
@@ -4,7 +4,7 @@
4	%%CreationDate: Wed Mar 8 14:31:53 1995	4	%%CreationDate: Wed Mar 8 14:31:53 1995
5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)	5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
6		6
7	% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.	7	% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
8	%	8	%
9	% This file is part of GNU Emacs.	9	% This file is part of GNU Emacs.
10	%	10	%


diff --git a/doc/lispintro/lambda-2.eps b/doc/lispintro/lambda-2.eps index 473785c81af..a7c2e7b830b 100644 --- a/doc/lispintro/lambda-2.eps +++ b/doc/lispintro/lambda-2.eps
@@ -4,7 +4,7 @@
4	%%CreationDate: Wed Mar 8 14:33:09 1995	4	%%CreationDate: Wed Mar 8 14:33:09 1995
5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)	5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
6		6
7	% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.	7	% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
8	%	8	%
9	% This file is part of GNU Emacs.	9	% This file is part of GNU Emacs.
10	%	10	%


diff --git a/doc/lispintro/lambda-3.eps b/doc/lispintro/lambda-3.eps index c1a251682f8..d73a9d69104 100644 --- a/doc/lispintro/lambda-3.eps +++ b/doc/lispintro/lambda-3.eps
@@ -4,7 +4,7 @@
4	%%CreationDate: Wed Mar 8 14:33:49 1995	4	%%CreationDate: Wed Mar 8 14:33:49 1995
5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)	5	%%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu)
6		6
7	% Copyright (C) 1995, 1997, 2001-2018 Free Software Foundation, Inc.	7	% Copyright (C) 1995, 1997, 2001-2019 Free Software Foundation, Inc.
8	%	8	%
9	% This file is part of GNU Emacs.	9	% This file is part of GNU Emacs.
10	%	10	%