From: Robert Pluim <rpluim@gmail.com>
Date: Fri, 24 Jan 2020 11:04:36 +0000 (+0100)
Subject: Expand Cairo and HarfBuzz descriptions
X-Git-Tag: emacs-28.0.90~7908^2~61
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ba7abe243f0d0c23bc9abca775ae4709dd03030;p=emacs.git

Expand Cairo and HarfBuzz descriptions

* etc/NEWS:
* configure.ac: Expand description of Cairo and Harfbuzz
---

diff --git a/configure.ac b/configure.ac
index 932142d813a..27e44dacfb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5892,17 +5892,18 @@ you can continue to support by using '$0 --with-pop'.])
 fi
 
 if test "${HAVE_XFT}" = yes; then
-AC_MSG_WARN([This configuration uses libXft,
-    which has a number of font rendering issues, and is being considered for
-    removal in the next release of Emacs.  Please consider using Cairo + HarfBuzz
-    instead (they are auto-detected if the relevant development headers are
-    installed).])
+  AC_MSG_WARN([This configuration uses libXft, which has a number of
+    font rendering issues, and is being considered for removal in the
+    next release of Emacs.  Please consider using Cairo graphics +
+    HarfBuzz text shaping instead (they are auto-detected if the
+    relevant development headers are installed).])
 fi
 
 if test "${HAVE_CAIRO}" = "yes" && test "${HAVE_HARFBUZZ}" = no; then
-   AC_MSG_WARN([This configuration uses Cairo, but not HarfBuzz.  We
-    recommend the use of HarfBuzz when using Cairo, please install
-    HarfBuzz development packages.])
+  AC_MSG_WARN([This configuration uses the Cairo graphics library,
+    but not the HarfBuzz font shaping library.  We recommend the use
+    of HarfBuzz when using Cairo, please install HarfBuzz development
+    packages.])
 fi
 
 # Let plain 'make' work.
diff --git a/etc/NEWS b/etc/NEWS
index e821a3e95cf..5395f2ccfb2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -24,22 +24,22 @@ applies, and please also update docstrings as needed.
 
 * Installation Changes in Emacs 28.1
 
-** Cairo is now used by default if found.
+** Cairo graphics library is now used by default if found.
 '--with-cairo' is now the default, if the appropriate development files
 are found by 'configure'.  Note that building with Cairo means using
 Pango instead of libXFT for font support.  Since Pango 1.44 has
 removed support for bitmapped fonts, this may require you to adjust
 your font settings.
 
-Note also that 'FontBackend' settings in ".Xdefaults" or ".Xresources",
-or 'font-backend' frame parameter settings in your init files, may need
-to be adjusted, as 'xft' is no longer a valid backend when using
-Cairo.  Use 'ftcrhb' if your Emacs was built with HarfBuzz support,
-and 'ftcr' otherwise.  You can determine this by checking
-'system-configuration-features'.  The 'ftcr' backend will still be
-available when HarfBuzz is supported, but will not be used by default.
-We strongly recommend building with HarBuzz support. 'x' is still a
-valid backend.
+Note also that 'FontBackend' settings in ".Xdefaults" or
+".Xresources", or 'font-backend' frame parameter settings in your init
+files, may need to be adjusted, as 'xft' is no longer a valid backend
+when using Cairo.  Use 'ftcrhb' if your Emacs was built with HarfBuzz
+text shaping support, and 'ftcr' otherwise.  You can determine this by
+checking 'system-configuration-features'.  The 'ftcr' backend will
+still be available when HarfBuzz is supported, but will not be used by
+default.  We strongly recommend building with HarBuzz support. 'x' is
+still a valid backend.
 
 ---
 ** 'configure' now warns about building with libXft support.
@@ -51,8 +51,8 @@ Cairo + HarfBuzz instead.
 ---
 ** 'configure' now warns about not using HarfBuzz if using Cairo.
 We want to encourage people to use the most modern font features
-available, and this is Cairo + HarfBuzz, so 'configure' now recommends
-that combination.
+available, and this is the Cairo graphics library + HarfBuzz for font
+shaping, so 'configure' now recommends that combination.
 
 ---
 ** The ftx font backend driver has been removed.