diff options
| author | Paul Eggert | 2018-01-01 01:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-01-01 01:13:04 -0800 |
| commit | bb267f17f9e1e593d8dee379aceee22d7fa42680 (patch) | |
| tree | 466dfb3f8ef7587ebcb652709bd1cc05d18a92f3 /etc/tutorials/TUTORIAL.zh | |
| parent | a5835dfee139322de7aa071f1c87ef015acbecad (diff) | |
| parent | 63b04c11d530f4a6a41f112d1b3ba1ed1eb81195 (diff) | |
| download | emacs-bb267f17f9e1e593d8dee379aceee22d7fa42680.tar.gz emacs-bb267f17f9e1e593d8dee379aceee22d7fa42680.zip | |
Merge from origin/emacs-26
63b04c11d5 Fix copyright years by hand
5c7dd8a783 Update copyright year to 2018
220a9ecba1 Merge from Gnulib
312c565566 Don't add empty keyboard macro to macro ring (Bug#24992)
39ca289a7a Allow customization of decoding of "man" command
f8240815ea * etc/NEWS: Add security consideration note on passphrase ...
0c78822c70 Fix subtle problem with scroll-down when scroll-margin is ...
acd289c5a4 Fix problems with indexing in User manual
b240c7846b * lisp/help.el (describe-key): Only (copy-sequence elt) wh...
e879a5444a * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846
81b1028b63 Improve documentation of 'inhibit-modification-hooks' and ...
7175496d7a Fix doc string of 'enable-recursive-minibuffers'
5b38406491 Fix documentation of delsel and of killing text
# 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 07c3e1f03c9..4bbdc600890 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-2017 Free Software Foundation, Inc. | 1052 | Copyright (C) 1985, 1996, 1998, 2001-2018 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 |