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 /etc/tutorials/TUTORIAL.zh | |
| 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 'etc/tutorials/TUTORIAL.zh')
| -rw-r--r-- | etc/tutorials/TUTORIAL.zh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/tutorials/TUTORIAL.zh b/etc/tutorials/TUTORIAL.zh index 778338e2122..3b4fb13c62e 100644 --- a/etc/tutorials/TUTORIAL.zh +++ b/etc/tutorials/TUTORIAL.zh | |||
| @@ -1049,7 +1049,7 @@ issue here>」。 | |||
| 1049 | 這個版本的快速指南和 GNU Emacs 一樣都是版權化的，並且允許在某些條件下 | 1049 | 這個版本的快速指南和 GNU Emacs 一樣都是版權化的，並且允許在某些條件下 |
| 1050 | 散佈其拷貝： | 1050 | 散佈其拷貝： |
| 1051 | 1051 | ||
| 1052 | Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation, Inc. | 1052 | Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, Inc. |
| 1053 | 1053 | ||
| 1054 | Permission is granted to anyone to make or distribute verbatim copies | 1054 | Permission is granted to anyone to make or distribute verbatim copies |
| 1055 | of this document as received, in any medium, provided that the | 1055 | of this document as received, in any medium, provided that the |