diff options
| author | Paul Eggert | 2020-01-01 01:08:16 +0000 |
|---|---|---|
| committer | Paul Eggert | 2020-01-01 01:08:16 +0000 |
| commit | c6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch) | |
| tree | ab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /test/data | |
| parent | 47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff) | |
| parent | 186152ba400b58d2d278c52d2e3d896decae767e (diff) | |
| download | emacs-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 'test/data')
| -rw-r--r-- | test/data/emacs-module/mod-test.c | 2 | ||||
| -rw-r--r-- | test/data/themes/faces-test-dark-theme.el | 2 | ||||
| -rw-r--r-- | test/data/themes/faces-test-light-theme.el | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/data/emacs-module/mod-test.c b/test/data/emacs-module/mod-test.c index 5addf611472..8dc9ff144af 100644 --- a/test/data/emacs-module/mod-test.c +++ b/test/data/emacs-module/mod-test.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Test GNU Emacs modules. | 1 | /* Test GNU Emacs modules. |
| 2 | 2 | ||
| 3 | Copyright 2015-2019 Free Software Foundation, Inc. | 3 | Copyright 2015-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/test/data/themes/faces-test-dark-theme.el b/test/data/themes/faces-test-dark-theme.el index f5e41ccdaf9..2eb72d6b358 100644 --- a/test/data/themes/faces-test-dark-theme.el +++ b/test/data/themes/faces-test-dark-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; faces-test-dark-theme.el --- A dark theme from tests ;;; -*- lexical-binding: t; -*- | 1 | ;;; faces-test-dark-theme.el --- A dark theme from tests ;;; -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2019-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; This program is free software; you can redistribute it and/or modify | 5 | ;; This program is free software; you can redistribute it and/or modify |
| 6 | ;; it under the terms of the GNU General Public License as published by | 6 | ;; it under the terms of the GNU General Public License as published by |
diff --git a/test/data/themes/faces-test-light-theme.el b/test/data/themes/faces-test-light-theme.el index cab4f4130b7..4a7c7f6877d 100644 --- a/test/data/themes/faces-test-light-theme.el +++ b/test/data/themes/faces-test-light-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; faces-test-light-theme.el --- A dark theme from tests ;;; -*- lexical-binding: t; -*- | 1 | ;;; faces-test-light-theme.el --- A dark theme from tests ;;; -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2019-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; This program is free software; you can redistribute it and/or modify | 5 | ;; This program is free software; you can redistribute it and/or modify |
| 6 | ;; it under the terms of the GNU General Public License as published by | 6 | ;; it under the terms of the GNU General Public License as published by |