Paul Eggert bb267f17f9 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		2018-01-01 01:13:04 -08:00
..
ChangeLog.1	Update copyright year to 2018	2018-01-01 00:57:59 -08:00
ChangeLog.2	Update copyright year to 2018	2018-01-01 00:57:59 -08:00
erc-autoaway.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-backend.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-button.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-capab.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-compat.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-dcc.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-desktop-notifications.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-ezbounce.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-fill.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-goodies.el	Update copyright year to 2018	2018-01-01 00:57:59 -08:00
erc-ibuffer.el	Update copyright year to 2018	2018-01-01 00:57:59 -08:00
erc-identd.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-imenu.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-join.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-lang.el	Update copyright year to 2018	2018-01-01 00:57:59 -08:00
erc-list.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-log.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-match.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-menu.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-netsplit.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-networks.el	Update copyright year to 2018	2018-01-01 00:57:59 -08:00
erc-notify.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-page.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-pcomplete.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-replace.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-ring.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-services.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-sound.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-speedbar.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-spelling.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-stamp.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-track.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-truncate.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc-xdcc.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00
erc.el	Merge from origin/emacs-26	2018-01-01 01:13:04 -08:00