Skip to content

Commit 9ba7abe

Browse files
committed
Expand Cairo and HarfBuzz descriptions
* etc/NEWS: * configure.ac: Expand description of Cairo and Harfbuzz
1 parent 1ebe160 commit 9ba7abe

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

configure.ac

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5892,17 +5892,18 @@ you can continue to support by using '$0 --with-pop'.])
58925892
fi
58935893

58945894
if test "${HAVE_XFT}" = yes; then
5895-
AC_MSG_WARN([This configuration uses libXft,
5896-
which has a number of font rendering issues, and is being considered for
5897-
removal in the next release of Emacs. Please consider using Cairo + HarfBuzz
5898-
instead (they are auto-detected if the relevant development headers are
5899-
installed).])
5895+
AC_MSG_WARN([This configuration uses libXft, which has a number of
5896+
font rendering issues, and is being considered for removal in the
5897+
next release of Emacs. Please consider using Cairo graphics +
5898+
HarfBuzz text shaping instead (they are auto-detected if the
5899+
relevant development headers are installed).])
59005900
fi
59015901

59025902
if test "${HAVE_CAIRO}" = "yes" && test "${HAVE_HARFBUZZ}" = no; then
5903-
AC_MSG_WARN([This configuration uses Cairo, but not HarfBuzz. We
5904-
recommend the use of HarfBuzz when using Cairo, please install
5905-
HarfBuzz development packages.])
5903+
AC_MSG_WARN([This configuration uses the Cairo graphics library,
5904+
but not the HarfBuzz font shaping library. We recommend the use
5905+
of HarfBuzz when using Cairo, please install HarfBuzz development
5906+
packages.])
59065907
fi
59075908

59085909
# Let plain 'make' work.

etc/NEWS

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ applies, and please also update docstrings as needed.
2424

2525
* Installation Changes in Emacs 28.1
2626

27-
** Cairo is now used by default if found.
27+
** Cairo graphics library is now used by default if found.
2828
'--with-cairo' is now the default, if the appropriate development files
2929
are found by 'configure'. Note that building with Cairo means using
3030
Pango instead of libXFT for font support. Since Pango 1.44 has
3131
removed support for bitmapped fonts, this may require you to adjust
3232
your font settings.
3333

34-
Note also that 'FontBackend' settings in ".Xdefaults" or ".Xresources",
35-
or 'font-backend' frame parameter settings in your init files, may need
36-
to be adjusted, as 'xft' is no longer a valid backend when using
37-
Cairo. Use 'ftcrhb' if your Emacs was built with HarfBuzz support,
38-
and 'ftcr' otherwise. You can determine this by checking
39-
'system-configuration-features'. The 'ftcr' backend will still be
40-
available when HarfBuzz is supported, but will not be used by default.
41-
We strongly recommend building with HarBuzz support. 'x' is still a
42-
valid backend.
34+
Note also that 'FontBackend' settings in ".Xdefaults" or
35+
".Xresources", or 'font-backend' frame parameter settings in your init
36+
files, may need to be adjusted, as 'xft' is no longer a valid backend
37+
when using Cairo. Use 'ftcrhb' if your Emacs was built with HarfBuzz
38+
text shaping support, and 'ftcr' otherwise. You can determine this by
39+
checking 'system-configuration-features'. The 'ftcr' backend will
40+
still be available when HarfBuzz is supported, but will not be used by
41+
default. We strongly recommend building with HarBuzz support. 'x' is
42+
still a valid backend.
4343

4444
---
4545
** 'configure' now warns about building with libXft support.
@@ -51,8 +51,8 @@ Cairo + HarfBuzz instead.
5151
---
5252
** 'configure' now warns about not using HarfBuzz if using Cairo.
5353
We want to encourage people to use the most modern font features
54-
available, and this is Cairo + HarfBuzz, so 'configure' now recommends
55-
that combination.
54+
available, and this is the Cairo graphics library + HarfBuzz for font
55+
shaping, so 'configure' now recommends that combination.
5656

5757
---
5858
** The ftx font backend driver has been removed.

0 commit comments

Comments
 (0)