diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-01 01:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-01 01:13:04 -0800 |
| commit | bb267f17f9e1e593d8dee379aceee22d7fa42680 (patch) | |
| tree | 466dfb3f8ef7587ebcb652709bd1cc05d18a92f3 /lisp/erc/erc-ring.el | |
| parent | a5835dfee139322de7aa071f1c87ef015acbecad (diff) | |
| parent | 63b04c11d530f4a6a41f112d1b3ba1ed1eb81195 (diff) | |
| download | emacs-bb267f17f9e1e593d8dee379aceee22d7fa42680.tar.gz | |
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 'lisp/erc/erc-ring.el')
| -rw-r--r-- | lisp/erc/erc-ring.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el index 2d6152ccea8..7e315d3b6ed 100644 --- a/lisp/erc/erc-ring.el +++ b/lisp/erc/erc-ring.el @@ -1,6 +1,6 @@ ;; erc-ring.el -- Command history handling for erc using ring.el -;; Copyright (C) 2001-2004, 2006-2017 Free Software Foundation, Inc. +;; Copyright (C) 2001-2004, 2006-2018 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: emacs-devel@gnu.org |