From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 2 May 2016 01:07:56 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2028
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b57c1741abfb95da1dc6c165339551daff2ca3e1;p=emacs.git

Merge from origin/emacs-25

5a952eb Don't mention ~/.emacs.bmk literally in doc strings
c338cf3 * etc/NEWS: Explain why multicolor font display is disabled o...
c30d1b4 Port to Ubuntu 16.04 --enable-gcc-warnings
---

b57c1741abfb95da1dc6c165339551daff2ca3e1