merge from trunk

2 files changed, 9 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index bd5534d9446..5483d824da4 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-15  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * NEWS: Mention the macfont backend.
+
 2013-09-09  Glenn Morris  <rgm@gnu.org>
 
         * refcards/Makefile (PS_ENGLISH, PS_CZECH, PS_FRENCH, PS_GERMAN)
diff --git a/etc/NEWS b/etc/NEWS
index a5da8eaa893..7558fc53052 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -54,6 +54,11 @@ and zlib-format compressed data.
 ** Emacs for NS (OSX, GNUStep) can be built with ImageMagick support.
 pkg-config is required to find ImageMagick libraries.
 
+** For OSX >= 10.5, the Core text based font backend from the Mac port is used.
+For GNUStep and OSX 10.4 the old backend is used.
+To use the old backend by default, do on the command line:
+% defaults write org.gnu.Emacs FontBackend ns
+
 
 * Startup Changes in Emacs 24.4