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-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/16e4bd52e3119d4905de02d33f1cc134498cb0b6

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