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

Merge from origin/emacs-25

7bc4820 Make setf for frame-height/width work again
---

fd4fc004ab4d4fd5a75f1663e7067e58cf389912