master ca8f4ebc49: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit ca8f4ebc492c470ec041e11f5d5b005c6d0d44e6
Merge: 86969f9658 225e0d6047
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    225e0d6047 Correct etc/NEWS entry about bitmapped fonts
    
    # Conflicts:
    #       etc/NEWS
---
 etc/NEWS.28 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/etc/NEWS.28 b/etc/NEWS.28
index 58c7c44a2b..84041d79c2 100644
--- a/etc/NEWS.28
+++ b/etc/NEWS.28
@@ -43,11 +43,10 @@ recommend examining any such warnings before you decide 
they are
 false.
 
 ** The Cairo graphics library is now used by default if present.
-'--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.
+'--with-cairo' is now the default, if the appropriate development
+files are found by 'configure'.  Building with Cairo is known to cause
+some problems with bitmap fonts.  This may require you to adjust your
+font settings, or to build with Xft support instead.
 
 Note also that 'FontBackend' settings in ".Xdefaults" or
 ".Xresources", or 'font-backend' frame parameter settings in your init