code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

delx.au / code / gnu-emacs / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 433d366 d0d9f55)

author	Paul Eggert <eggert@cs.ucla.edu>
	Tue, 10 May 2016 14:44:28 +0000 (07:44 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Tue, 10 May 2016 14:44:28 +0000 (07:44 -0700)
commit	6d0703a01df1ece3fd9ba2a927913d1bcf10d549
tree	e3492449c92c0895ac77853d0a8ea07c0ecfe24f	tree
parent	433d366dc7b053048abf710d790ff62421dd1570	commit \| diff
parent	d0d9f55b632717fccb605e0a204ebdd5ffe8608f	commit \| diff

Merge from origin/emacs-25

d0d9f55 Allow newlines inside cl function arglists
963541a Publicize cl--generic-all-functions
3c581d5 ; Fix typo
e58f900 Add some "safe-local-variable" declarations for compatibility...

etc/NEWS	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/eieio-opt.el	diff1 \|	diff2 \|	blob \| history
lisp/help.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/cc-vars.el	diff1 \|	diff2 \|	blob \| history