Merge from origin/emacs-25

[gnu-emacs] / etc / NEWS

diff --git a/etc/NEWS b/etc/NEWS
index bc63058de2b73869b01127a35a35b75776d4ce3f..3c4cf66240a9982cb0ad689075ce5dd7713f3e04 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2462,6 +2462,12 @@ non-native NS fullscreen.  The default is nil.  Set to t to enable
 animation when entering and leaving fullscreen.  For native OSX fullscreen
 this has no effect.
 
+** On the OS X Cocoa ("Nextstep") port, multicolor font (such as color
+emoji) display is disabled.  This feature was accidentally added when
+Emacs 24.4 included the new Core Text based font backend code that was
+originally implemented for a non-mainline port.  This will be enabled
+again once it is also implemented in Emacs on free operating systems.
+
 ---
 ** The new function 'w32-application-type' returns the type of an
 MS-Windows application given the name of its executable program file.