projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 198e0d4 5381c70)
Merge from origin/emacs-26
authorMichael Albinus <michael.albinus@gmx.de>
Sat, 9 Dec 2017 09:13:02 +0000 (10:13 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sat, 9 Dec 2017 09:13:02 +0000 (10:13 +0100)
5381c70b7a In windows.texi mention special splitting behavior of side...
46d62b9f36 * lisp/gnus/gnus-group.el (gnus-group-mode-map): Bind [fol...
1ef1dbdbc5 Avoid compilation warning in xterm.c
5cf3c26f2d * README: Document all the top-level directories.  (Bug#29...
e9ea2065a8 Don't enable erc modules on simply loading erc.el

1  2 
README patch | diff1 | diff2 | blob | history
lisp/erc/erc.el patch | diff1 | diff2 | blob | history
lisp/gnus/gnus-group.el patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
diff --cc lisp/erc/erc.el
Simple merge
diff --cc lisp/gnus/gnus-group.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.