projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97fc87a 7efb366)
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Thu, 18 Jan 2018 22:02:32 +0000 (14:02 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 19 Jan 2018 01:17:05 +0000 (17:17 -0800)
7efb366 ; * etc/AUTHORS: Regenerate.
3dc7f68 * admin/authors.el (authors-aliases): Tighten more entries.
7428062 ; * lisp/vc/vc.el: Comment fixes.
f4e6b6e Small startup fix for current-load-list
5b776bf ; * etc/AUTHORS: Regenerate.
d80295c authors-aliases is based on regexps, not literals

1  2 
lisp/startup.el patch | diff1 | diff2 | blob | history
lisp/vc/vc.el patch | diff1 | diff2 | blob | history

diff --cc lisp/startup.el
Simple merge
diff --cc lisp/vc/vc.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.