From: John Wiegley <johnw@newartisans.com>
Date: Fri, 4 Mar 2016 07:52:27 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2393
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6b565b4a1d0fedede8dbd325af1d4c63ec5ec58;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

ce4bdd7 Highlight assignments in Makefiles more correctly
---

b6b565b4a1d0fedede8dbd325af1d4c63ec5ec58