; Merge from origin/emacs-25
commitfe6131b72468a71b1bae3bbafcb408a24a460a13
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:06 +0000 (7 12:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:06 +0000 (7 12:41 -0800)
tree6b7977aa4f1835921c600a2d4258cca836236211
parentc102a84a48cf91f6ffde43270ff34b37fdada8dd
parentda71c89ba39f500f4c65d986863512f293934401
; Merge from origin/emacs-25

The following commit was skipped:

da71c89 * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Fix docs...