diff options
author | Eli Zaretskii <eliz@gnu.org> | 2022-01-01 07:03:03 -0500 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2022-01-01 07:03:03 -0500 |
commit | dcd76bd48df678d8234b904d7b13c997228519a3 (patch) | |
tree | 17b11e7d3aa1aa9d32d6be874cbbfb1e5882a2c5 /doc/lispintro | |
parent | 84a8f656d344cc69bce3a922b99182896a4e1285 (diff) | |
parent | 836be7a112191cac8abd187e337c477ff5f05037 (diff) | |
download | emacs-dcd76bd48df678d8234b904d7b13c997228519a3.tar.gz |
Merge from origin/emacs-28
836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year.
86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year
ebe8772f65 ; Minor fixes related to copyright years
23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye...
8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t.
19dcb237b5 ; Add 2022 to copyright years.
# Conflicts:
# etc/NEWS
# etc/refcards/ru-refcard.tex
# lib/cdefs.h
# lisp/erc/erc-dcc.el
# lisp/erc/erc-imenu.el
# lisp/erc/erc-replace.el
# lisp/image-dired.el
# lisp/progmodes/xref.el
# m4/alloca.m4
# m4/byteswap.m4
# m4/errno_h.m4
# m4/getopt.m4
# m4/gnulib-common.m4
# m4/inttypes.m4
# m4/stddef_h.m4
# m4/stdint.m4
# m4/sys_socket_h.m4
Diffstat (limited to 'doc/lispintro')
-rw-r--r-- | doc/lispintro/ChangeLog.1 | 2 | ||||
-rw-r--r-- | doc/lispintro/Makefile.in | 2 | ||||
-rw-r--r-- | doc/lispintro/README | 2 | ||||
-rw-r--r-- | doc/lispintro/cons-1.eps | 2 | ||||
-rw-r--r-- | doc/lispintro/cons-2.eps | 2 | ||||
-rw-r--r-- | doc/lispintro/cons-2a.eps | 2 | ||||
-rw-r--r-- | doc/lispintro/cons-3.eps | 2 | ||||
-rw-r--r-- | doc/lispintro/cons-4.eps | 2 | ||||
-rw-r--r-- | doc/lispintro/cons-5.eps | 2 | ||||
-rw-r--r-- | doc/lispintro/drawers.eps | 2 | ||||
-rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 2 | ||||
-rw-r--r-- | doc/lispintro/lambda-1.eps | 2 | ||||
-rw-r--r-- | doc/lispintro/lambda-2.eps | 2 | ||||
-rw-r--r-- | doc/lispintro/lambda-3.eps | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/doc/lispintro/ChangeLog.1 b/doc/lispintro/ChangeLog.1 index bb4323a7734..a581faa73b9 100644 --- a/doc/lispintro/ChangeLog.1 +++ b/doc/lispintro/ChangeLog.1 @@ -782,7 +782,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001-2021 Free Software Foundation, Inc. + Copyright (C) 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index 294b310d673..d554f3d7a68 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1994-1999, 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-1999, 2001-2022 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispintro/README b/doc/lispintro/README index eca19c76a42..b6dc23bb904 100644 --- a/doc/lispintro/README +++ b/doc/lispintro/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2021 Free Software Foundation, Inc. +Copyright (C) 2001-2022 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 4877df7135e..f2e445b8517 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-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 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 48fdc7e8768..fd607021e74 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-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 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 81053d3f26c..23051ef7fcb 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-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 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 e6a80f1c8ba..24fb0e11004 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-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 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 c1aac9c09bc..70a82103f51 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-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 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 a0918a92c53..03391127b01 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-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps index 725bd9723ce..7e3c83deb61 100644 --- a/doc/lispintro/drawers.eps +++ b/doc/lispintro/drawers.eps @@ -9,7 +9,7 @@ %%EndComments %%BeginProlog -% Copyright (C) 2001-2021 Free Software Foundation, Inc. +% Copyright (C) 2001-2022 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 04269404e48..9d4520b040e 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -117,7 +117,7 @@ Edition @value{edition-number}, @value{update-date} @sp 1 Distributed with Emacs version @value{EMACSVER}. @sp 1 -Copyright @copyright{} 1990--1995, 1997, 2001--2021 Free Software +Copyright @copyright{} 1990--1995, 1997, 2001--2022 Free Software Foundation, Inc. @sp 1 diff --git a/doc/lispintro/lambda-1.eps b/doc/lispintro/lambda-1.eps index 43b2d08aedc..a9adeae357d 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-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 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 c6c71f2b776..05cf437b1eb 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-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 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 ae939d537f4..8ff4c7c4fc1 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-2021 Free Software Foundation, Inc. +% Copyright (C) 1995, 1997, 2001-2022 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % |