aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert2016-05-01 18:07:56 -0700
committerPaul Eggert2016-05-01 18:07:56 -0700
commitb57c1741abfb95da1dc6c165339551daff2ca3e1 (patch)
treed3b51835457ca49fe59b311b5c72ee9cd272414d /etc
parent309cefe0c2ecabc4ae10d6b86141b92f7c14e74e (diff)
parent5a952eb7f6a6b2a0a050cba618a4424e638a861a (diff)
downloademacs-b57c1741abfb95da1dc6c165339551daff2ca3e1.tar.gz
emacs-b57c1741abfb95da1dc6c165339551daff2ca3e1.zip
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
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS6
1 files changed, 6 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index bc63058de2b..3c4cf66240a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2462,6 +2462,12 @@ non-native NS fullscreen. The default is nil. Set to t to enable
2462animation when entering and leaving fullscreen. For native OSX fullscreen 2462animation when entering and leaving fullscreen. For native OSX fullscreen
2463this has no effect. 2463this has no effect.
2464 2464
2465** On the OS X Cocoa ("Nextstep") port, multicolor font (such as color
2466emoji) display is disabled. This feature was accidentally added when
2467Emacs 24.4 included the new Core Text based font backend code that was
2468originally implemented for a non-mainline port. This will be enabled
2469again once it is also implemented in Emacs on free operating systems.
2470
2465--- 2471---
2466** The new function 'w32-application-type' returns the type of an 2472** The new function 'w32-application-type' returns the type of an
2467MS-Windows application given the name of its executable program file. 2473MS-Windows application given the name of its executable program file.