From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 7 Dec 2016 20:41:06 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1162
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fe6131b72468a71b1bae3bbafcb408a24a460a13;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

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

fe6131b72468a71b1bae3bbafcb408a24a460a13