From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 23 Mar 2016 18:24:28 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2294
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=16e4bd52e3119d4905de02d33f1cc134498cb0b6;p=emacs.git

Merge from origin/emacs-25

e643977 Make `toggle-frame-maximized' respect the dock on OS X (bug#2...
38a43f1 Fix bug in displaying header line with a box face
---

16e4bd52e3119d4905de02d33f1cc134498cb0b6