| commit | 6ee00324619673b402dadb3c28e791b79527868f | |
| author | Glenn Morris <rgm@gnu.org> | |
| Fri, 20 Jul 2018 17:00:32 +0000 (20 10:00 -0700) | ||
| committer | Glenn Morris <rgm@gnu.org> | |
| Fri, 20 Jul 2018 17:00:32 +0000 (20 10:00 -0700) | ||
| tree | 57070a6bb9dcf0620107f113f67551fe622c7385 | treesnapshot (tar.gz zip) |
| parent | 144bcc0132e61cc932348312720d592764022844 | commitdiff |
| parent | 3e722980df9d4a705394c843a2a5e051e9c682b6 | commitdiff |
Merge from origin/emacs-26
3e72298 Improve documentation of 'pcase-defmacro rx'
ba9b9bb Fix TTY colors breakage by 'clear-face-cache'
f56ad42 * admin/MAINTAINERS: Add files maintained by me (Michael Albi...
7a258fa Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
cb50077 Fix auth-source-delete (Bug#26184)
a4767a6 Avoid assertion violations in gnutls.c
90110f8 Don't use a literal "C-u" in ispell.el help message text
f4e7f6d Improve documentation of 'seqp'
ed13639 Clarify usage and dependencies between several Flyspell features
Conflicts:
etc/NEWS
test/lisp/auth-source-tests.el
3e72298 Improve documentation of 'pcase-defmacro rx'
ba9b9bb Fix TTY colors breakage by 'clear-face-cache'
f56ad42 * admin/MAINTAINERS: Add files maintained by me (Michael Albi...
7a258fa Adapt shadowfile.el for Tramp (Bug#4526, Bug#4846)
cb50077 Fix auth-source-delete (Bug#26184)
a4767a6 Avoid assertion violations in gnutls.c
90110f8 Don't use a literal "C-u" in ispell.el help message text
f4e7f6d Improve documentation of 'seqp'
ed13639 Clarify usage and dependencies between several Flyspell features
Conflicts:
etc/NEWS
test/lisp/auth-source-tests.el