aboutsummaryrefslogtreecommitdiffstats
path: root/etc/refcards
diff options
context:
space:
mode:
authorPaul Eggert2020-01-01 01:08:16 +0000
committerPaul Eggert2020-01-01 01:08:16 +0000
commitc6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch)
treeab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /etc/refcards
parent47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff)
parent186152ba400b58d2d278c52d2e3d896decae767e (diff)
downloademacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz
emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.zip
Merge from origin/emacs-27
186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3 4cd143aded Fix copyright years by hand 365e01cc9f Update copyright year to 2020 cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac... # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
Diffstat (limited to 'etc/refcards')
-rw-r--r--etc/refcards/Makefile2
-rw-r--r--etc/refcards/README4
-rw-r--r--etc/refcards/calccard.tex2
-rw-r--r--etc/refcards/cs-dired-ref.tex2
-rw-r--r--etc/refcards/cs-refcard.tex2
-rw-r--r--etc/refcards/cs-survival.tex2
-rw-r--r--etc/refcards/de-refcard.tex2
-rw-r--r--etc/refcards/dired-ref.tex2
-rw-r--r--etc/refcards/emacsver.tex.in2
-rw-r--r--etc/refcards/fr-dired-ref.tex2
-rw-r--r--etc/refcards/fr-refcard.tex2
-rw-r--r--etc/refcards/fr-survival.tex2
-rw-r--r--etc/refcards/gnus-logo.eps2
-rw-r--r--etc/refcards/gnus-refcard.tex2
-rw-r--r--etc/refcards/orgcard.tex2
-rw-r--r--etc/refcards/pdflayout.sty2
-rw-r--r--etc/refcards/pl-refcard.tex2
-rw-r--r--etc/refcards/pt-br-refcard.tex2
-rw-r--r--etc/refcards/refcard.tex2
-rw-r--r--etc/refcards/ru-refcard.tex4
-rw-r--r--etc/refcards/sk-dired-ref.tex2
-rw-r--r--etc/refcards/sk-refcard.tex2
-rw-r--r--etc/refcards/sk-survival.tex2
-rw-r--r--etc/refcards/survival.tex2
-rw-r--r--etc/refcards/vipcard.tex2
-rw-r--r--etc/refcards/viperCard.tex2
26 files changed, 28 insertions, 28 deletions
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index 0ba6db5aa28..c0f0233f921 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -1,6 +1,6 @@
1### Makefile for Emacs refcards 1### Makefile for Emacs refcards
2 2
3## Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc. 3## Copyright (C) 1993-1994, 2001-2020 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/etc/refcards/README b/etc/refcards/README
index 9e85830257e..f3de99f9610 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -1,4 +1,4 @@
1Copyright (C) 2013-2019 Free Software Foundation, Inc. 1Copyright (C) 2013-2020 Free Software Foundation, Inc.
2See the end of the file for license conditions. 2See the end of the file for license conditions.
3 3
4 4
@@ -32,7 +32,7 @@ it is reproduced here for convenience.
32 32
33File: gnus-logo.eps, gnus-logo.pdf 33File: gnus-logo.eps, gnus-logo.pdf
34 Author: Luis Fernandes <elf@ee.ryerson.ca> 34 Author: Luis Fernandes <elf@ee.ryerson.ca>
35 Copyright (C) 2001-2019 Free Software Foundation, Inc. 35 Copyright (C) 2001-2020 Free Software Foundation, Inc.
36 License: GNU General Public License version 3 or later (see COPYING) 36 License: GNU General Public License version 3 or later (see COPYING)
37 37
38 38
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index 7e28f83057a..a562f1e9446 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -20,7 +20,7 @@
20% Typical command to format: tex calccard.tex 20% Typical command to format: tex calccard.tex
21% Typical command to print (3 cols): dvips -t landscape calccard.dvi 21% Typical command to print (3 cols): dvips -t landscape calccard.dvi
22 22
23% Copyright (C) 1987, 1992, 2001-2019 Free Software Foundation, Inc. 23% Copyright (C) 1987, 1992, 2001--2020 Free Software Foundation, Inc.
24 24
25% This document is free software: you can redistribute it and/or modify 25% This document is free software: you can redistribute it and/or modify
26% it under the terms of the GNU General Public License as published by 26% it under the terms of the GNU General Public License as published by
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index 172a2c6d156..9a37f16edd3 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -1,6 +1,6 @@
1% Reference Card for Dired -*- coding: utf-8 -*- 1% Reference Card for Dired -*- coding: utf-8 -*-
2 2
3% Copyright (C) 2000-2019 Free Software Foundation, Inc. 3% Copyright (C) 2000--2020 Free Software Foundation, Inc.
4 4
5% Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> 5% Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
6% Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001 6% Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index ec9e9a9edfd..3b299bdd3ea 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -1,6 +1,6 @@
1% Reference Card for GNU Emacs -*- coding: utf-8 -*- 1% Reference Card for GNU Emacs -*- coding: utf-8 -*-
2 2
3% Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software 3% Copyright (C) 1987, 1993, 1996--1997, 2001--2020 Free Software
4% Foundation, Inc. 4% Foundation, Inc.
5 5
6% Author: Stephen Gildea <stepheng+emacs@gildea.com> 6% Author: Stephen Gildea <stepheng+emacs@gildea.com>
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index bdc35cd20e1..21f27479ebf 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -1,6 +1,6 @@
1% Title: GNU Emacs Survival Card -*- coding: utf-8 -*- 1% Title: GNU Emacs Survival Card -*- coding: utf-8 -*-
2 2
3% Copyright (C) 2000-2019 Free Software Foundation, Inc. 3% Copyright (C) 2000--2020 Free Software Foundation, Inc.
4 4
5% Author: Włodek Bzyl <matwb@univ.gda.pl> 5% Author: Włodek Bzyl <matwb@univ.gda.pl>
6% Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001 6% Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index 5c8127d0738..6d972ee52b5 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -1,6 +1,6 @@
1% Reference Card for GNU Emacs 1% Reference Card for GNU Emacs
2 2
3% Copyright (C) 1987, 1993, 1996, 2000-2019 Free Software Foundation, 3% Copyright (C) 1987, 1993, 1996, 2000--2020 Free Software Foundation,
4% Inc. 4% Inc.
5 5
6% Author: Stephen Gildea <stepheng+emacs@gildea.com> 6% Author: Stephen Gildea <stepheng+emacs@gildea.com>
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index 370ab84cc8d..85a70524948 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -1,6 +1,6 @@
1% Reference Card for Dired 1% Reference Card for Dired
2 2
3% Copyright (C) 2000-2019 Free Software Foundation, Inc. 3% Copyright (C) 2000--2020 Free Software Foundation, Inc.
4 4
5% Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> 5% Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
6 6
diff --git a/etc/refcards/emacsver.tex.in b/etc/refcards/emacsver.tex.in
index 9c2680cad1f..2f5bfb924bb 100644
--- a/etc/refcards/emacsver.tex.in
+++ b/etc/refcards/emacsver.tex.in
@@ -2,4 +2,4 @@
2\def\versionemacs{@majorversion@} % major version of emacs 2\def\versionemacs{@majorversion@} % major version of emacs
3%% This one should not be automatically updated; 3%% This one should not be automatically updated;
4%% M-x set-copyright in admin.el handles it. 4%% M-x set-copyright in admin.el handles it.
5\def\year{2019} % latest copyright year 5\def\year{2020} % latest copyright year
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex
index fbd9f893a6c..968c58bb90a 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -1,6 +1,6 @@
1% Reference Card for Dired -*- coding: utf-8 -*- 1% Reference Card for Dired -*- coding: utf-8 -*-
2 2
3% Copyright (C) 2000-2019 Free Software Foundation, Inc. 3% Copyright (C) 2000--2020 Free Software Foundation, Inc.
4 4
5% Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> 5% Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
6% French translation: Eric Jacoboni 6% French translation: Eric Jacoboni
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index 467c71a86fc..787556d386a 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -1,6 +1,6 @@
1% Reference Card for GNU Emacs 1% Reference Card for GNU Emacs
2 2
3% Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software 3% Copyright (C) 1987, 1993, 1996--1997, 2001--2020 Free Software
4% Foundation, Inc. 4% Foundation, Inc.
5 5
6% Author: Stephen Gildea <stepheng+emacs@gildea.com> 6% Author: Stephen Gildea <stepheng+emacs@gildea.com>
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index f0bbc11f12a..0aa5df3786c 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -1,7 +1,7 @@
1%&tex 1%&tex
2% Title: GNU Emacs Survival Card 2% Title: GNU Emacs Survival Card
3 3
4% Copyright (C) 2000-2019 Free Software Foundation, Inc. 4% Copyright (C) 2000--2020 Free Software Foundation, Inc.
5 5
6% Author: Włodek Bzyl <matwb@univ.gda.pl> 6% Author: Włodek Bzyl <matwb@univ.gda.pl>
7% French translation: \'Eric Jacoboni <jaco@teaser.fr>, November 2001 7% French translation: \'Eric Jacoboni <jaco@teaser.fr>, November 2001
diff --git a/etc/refcards/gnus-logo.eps b/etc/refcards/gnus-logo.eps
index fd2fea22f76..d446b36a95f 100644
--- a/etc/refcards/gnus-logo.eps
+++ b/etc/refcards/gnus-logo.eps
@@ -1,5 +1,5 @@
1%!PS-Adobe-2.0 EPSF-2.0 1%!PS-Adobe-2.0 EPSF-2.0
2% Copyright (C) 2000-2019 Free Software Foundation, Inc. 2% Copyright (C) 2000-2020 Free Software Foundation, Inc.
3% 3%
4% Author: Luis Fernandes <elf@ee.ryerson.ca> 4% Author: Luis Fernandes <elf@ee.ryerson.ca>
5% 5%
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index 7ecfc8217ef..895186decfe 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -120,7 +120,7 @@
120%% Gnus logo by Luis Fernandes. 120%% Gnus logo by Luis Fernandes.
121\newcommand{\Copyright}{% 121\newcommand{\Copyright}{%
122 \begin{center} 122 \begin{center}
123 Copyright \copyright\ 1995, 2000, 2002--2019 Free Software Foundation, Inc.\\* 123 Copyright \copyright\ 1995, 2000, 2002--2020 Free Software Foundation, Inc.\\*
124 \end{center} 124 \end{center}
125 125
126 Released under the terms of the GNU General Public License version 3 or later. 126 Released under the terms of the GNU General Public License version 3 or later.
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index cd89a24d269..a261cb5a5fb 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -17,7 +17,7 @@
17\pdflayout=(0l) 17\pdflayout=(0l)
18 18
19% Nothing else needs to be changed below this line. 19% Nothing else needs to be changed below this line.
20% Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software 20% Copyright (C) 1987, 1993, 1996--1997, 2001--2020 Free Software
21% Foundation, Inc. 21% Foundation, Inc.
22 22
23% This document is free software: you can redistribute it and/or modify 23% This document is free software: you can redistribute it and/or modify
diff --git a/etc/refcards/pdflayout.sty b/etc/refcards/pdflayout.sty
index b2ca7394010..de7738c4fbd 100644
--- a/etc/refcards/pdflayout.sty
+++ b/etc/refcards/pdflayout.sty
@@ -1,4 +1,4 @@
1% Copyright (C) 2007-2019 Free Software Foundation, Inc. 1% Copyright (C) 2007-2020 Free Software Foundation, Inc.
2 2
3% This file is part of GNU Emacs. 3% This file is part of GNU Emacs.
4 4
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index 54b6a10e4b4..68acac973b0 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -1,7 +1,7 @@
1%&mex 1%&mex
2% Reference Card for GNU Emacs 2% Reference Card for GNU Emacs
3 3
4% Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc. 4% Copyright (C) 1999, 2001--2020 Free Software Foundation, Inc.
5 5
6% Author: Stephen Gildea <stepheng+emacs@gildea.com> 6% Author: Stephen Gildea <stepheng+emacs@gildea.com>
7% Polish translation: Włodek Bzyl <matwb@univ.gda.pl> 7% Polish translation: Włodek Bzyl <matwb@univ.gda.pl>
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index b7840621eea..c75fd2f6406 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -1,6 +1,6 @@
1% Reference Card for GNU Emacs 1% Reference Card for GNU Emacs
2 2
3% Copyright (C) 1987, 1993, 1996-1997, 2002-2004, 2006-2019 Free 3% Copyright (C) 1987, 1993, 1996--1997, 2002--2004, 2006--2020 Free
4% Software Foundation, Inc. 4% Software Foundation, Inc.
5 5
6% Author: Stephen Gildea <stepheng+emacs@gildea.com> 6% Author: Stephen Gildea <stepheng+emacs@gildea.com>
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index d03e6654f0c..afae238c783 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -1,6 +1,6 @@
1% Reference Card for GNU Emacs 1% Reference Card for GNU Emacs
2 2
3% Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software 3% Copyright (C) 1987, 1993, 1996--1997, 2001--2020 Free Software
4% Foundation, Inc. 4% Foundation, Inc.
5 5
6% Author: Stephen Gildea <stepheng+emacs@gildea.com> 6% Author: Stephen Gildea <stepheng+emacs@gildea.com>
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index ab94acedf2c..0d210b45452 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -1,4 +1,4 @@
1% Copyright (C) 1997, 2002-2019 Free Software Foundation, Inc. 1% Copyright (C) 1997, 2002--2020 Free Software Foundation, Inc.
2 2
3% Author: Stephen Gildea <stepheng+emacs@gildea.com> 3% Author: Stephen Gildea <stepheng+emacs@gildea.com>
4% Russian translation: Alex Ott <alexott@gmail.com> 4% Russian translation: Alex Ott <alexott@gmail.com>
@@ -41,7 +41,7 @@
41\setlength{\ColThreeWidth}{25mm} 41\setlength{\ColThreeWidth}{25mm}
42 42
43\newcommand{\versionemacs}[0]{28} % version of Emacs this is for 43\newcommand{\versionemacs}[0]{28} % version of Emacs this is for
44\newcommand{\cyear}[0]{2019} % copyright year 44\newcommand{\cyear}[0]{2020} % copyright year
45 45
46\newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill 46\newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
47 \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. 47 \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 7b550d27e39..294c0e5cbe0 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -1,6 +1,6 @@
1% Reference Card for Dired -*- coding: utf-8 -*- 1% Reference Card for Dired -*- coding: utf-8 -*-
2 2
3% Copyright (C) 2000-2019 Free Software Foundation, Inc. 3% Copyright (C) 2000--2020 Free Software Foundation, Inc.
4 4
5% Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> 5% Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
6% Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001 6% Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index 7ec15983346..9302e1825e7 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -1,6 +1,6 @@
1% Reference Card for GNU Emacs -*- coding: utf-8 -*- 1% Reference Card for GNU Emacs -*- coding: utf-8 -*-
2 2
3% Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software 3% Copyright (C) 1987, 1993, 1996--1997, 2001--2020 Free Software
4% Foundation, Inc. 4% Foundation, Inc.
5 5
6% Author: Stephen Gildea <stepheng+emacs@gildea.com> 6% Author: Stephen Gildea <stepheng+emacs@gildea.com>
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index 80eb2aee08d..5f06c2d11e2 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -1,6 +1,6 @@
1% Title: GNU Emacs Survival Card -*- coding: utf-8 -*- 1% Title: GNU Emacs Survival Card -*- coding: utf-8 -*-
2 2
3% Copyright (C) 2000-2019 Free Software Foundation, Inc. 3% Copyright (C) 2000--2020 Free Software Foundation, Inc.
4 4
5% Author: Włodek Bzyl <matwb@univ.gda.pl> 5% Author: Włodek Bzyl <matwb@univ.gda.pl>
6% Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001 6% Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index b25c9af76b1..5e73a45b2d7 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -1,7 +1,7 @@
1%&tex 1%&tex
2% Title: GNU Emacs Survival Card 2% Title: GNU Emacs Survival Card
3 3
4% Copyright (C) 2000-2019 Free Software Foundation, Inc. 4% Copyright (C) 2000--2020 Free Software Foundation, Inc.
5 5
6% Author: Włodek Bzyl <matwb@univ.gda.pl> 6% Author: Włodek Bzyl <matwb@univ.gda.pl>
7 7
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex
index 87cf4ad3807..b55612b1a87 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -1,6 +1,6 @@
1% Quick Reference Card for VIP 1% Quick Reference Card for VIP
2 2
3% Copyright (C) 1987, 2001-2019 Free Software Foundation, Inc. 3% Copyright (C) 1987, 2001--2020 Free Software Foundation, Inc.
4 4
5% Author: Masahiko Sato <ms@sail.stanford.edu>, <masahiko@sato.riec.tohoku.junet> 5% Author: Masahiko Sato <ms@sail.stanford.edu>, <masahiko@sato.riec.tohoku.junet>
6 6
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index c3dfce5902c..6476563bb45 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -1,6 +1,6 @@
1% ViperCard -- The Reference Card for Viper under GNU Emacs 1% ViperCard -- The Reference Card for Viper under GNU Emacs
2 2
3% Copyright (C) 1995-1997, 2001-2019 Free Software Foundation, Inc. 3% Copyright (C) 1995--1997, 2001--2020 Free Software Foundation, Inc.
4 4
5% Author: Michael Kifer <kifer@cs.stonybrook.edu> (Viper) 5% Author: Michael Kifer <kifer@cs.stonybrook.edu> (Viper)
6% Aamod Sane <sane@cs.uiuc.edu> (VIP 4.3) 6% Aamod Sane <sane@cs.uiuc.edu> (VIP 4.3)
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-17 18:21:54 +0000