]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-27
authorAmin Bandali <bandali@gnu.org>
Sun, 12 Sep 2021 03:03:57 +0000 (23:03 -0400)
committerAmin Bandali <bandali@gnu.org>
Sun, 12 Sep 2021 03:03:57 +0000 (23:03 -0400)
commite4b7fa05001ef48db28a77e1343ffb196de39609
treed670aaa967ffd29ab92085f26d6c3da1e40db05e
parent108dbed4c0d874f71bc40f63d39d8777ce192303
parentd7f4cc0974645cc6a295740afe85c6e21d956119
Merge from origin/emacs-27

d7f4cc0974 ERC: Track: Clarify documentation on tracked buffers and a...
fb1f0dfec9 ERC: Track: Fix documentation of structure of 'erc-modifie...
252a769b11 ; * doc/lispref/files.texi (Changing Files): Fix xref to f...
edc93a5ce6 ; Fix grammar in efaq.texi on Emacs vs XEmacs.

# Conflicts:
# doc/misc/efaq.texi
doc/lispref/files.texi
doc/misc/efaq.texi
lisp/erc/erc-track.el