From: John Wiegley <johnw@newartisans.com>
Date: Tue, 12 Jan 2016 06:48:07 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2819^2~18
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8df9e56b4ad9704747dd8af7a049da9ee6ab3a00;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

30f4a89 Move variables to inner loop, preparing for Mac port merge
---

8df9e56b4ad9704747dd8af7a049da9ee6ab3a00