master 687fcc2c40: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 687fcc2c40d693bbe342d938e37a4c9a245a1b02
Merge: 05c4e7bfbd 9419bc904d
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    9419bc904d ; * lisp/printing.el: Delete outdated download instructions.
    31af0f4eb7 Don't list Emacs as requirement for built-in package
    ae348b719e Fix wrong metrics for bitmap-only fonts with HarfBuzz 5
---
 doc/misc/htmlfontify.texi | 10 +---------
 lisp/printing.el          |  9 ---------
 src/ftcrfont.c            |  6 +++++-
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi
index 0ab000b70f..fadc6a5cbe 100644
--- a/doc/misc/htmlfontify.texi
+++ b/doc/misc/htmlfontify.texi
@@ -10,8 +10,7 @@
 This manual documents Htmlfontify, a source code -> crosslinked +
 formatted + syntax colorized html transformer.
 
-Copyright @copyright{} 2002--2003, 2013--2022 Free Software Foundation,
-Inc.
+Copyright @copyright{} 2002--2022 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -1539,13 +1538,6 @@ Htmlfontify has a couple of external requirements:
 
 @itemize @bullet
 
-@item
-GNU Emacs 20.7+ or 21.1+
-
-Other versions may work---these have been used successfully by the
-author.  If you intend to use Htmlfontify in batch mode, 21.1+ is
-pretty much required.
-
 @item
 A copy of etags (exuberant-ctags or GNU etags).  Htmlfontify attempts
 to autodetect the version you have and customize itself accordingly,
diff --git a/lisp/printing.el b/lisp/printing.el
index 9f6b091023..534b45c772 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -56,10 +56,6 @@
 ;; spool and to despool PostScript buffer.  So, `printing' provides an
 ;; interface to ps-print package and it also provides some extra stuff.
 ;;
-;; To download the latest ps-print package see
-;; `https://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage'.
-;; Please, see README file for ps-print installation instructions.
-;;
 ;; `printing' was inspired by:
 ;;
 ;;    print-nt.el            Frederic Corne <frederic.corne@erli.fr>
@@ -935,11 +931,6 @@
 ;;
 ;; Below are some URL where you can find good utilities.
 ;;
-;; * For `printing' package:
-;;
-;;    printing `https://www.emacswiki.org/cgi-bin/emacs/download/printing.el'
-;;    ps-print `https://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage'
-;;
 ;; * For GNU or Unix system:
 ;;
 ;;    gs, gv         
`https://www.gnu.org/software/ghostscript/ghostscript.html'
diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 119ec28409..e089f9dea8 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -677,7 +677,11 @@ ftcrhbfont_begin_hb_font (struct font *font, double 
*position_unit)
 
   ftcrfont_info->ft_size = ft_face->size;
   hb_font_t *hb_font = fthbfont_begin_hb_font (font, position_unit);
-  if (ftcrfont_info->bitmap_position_unit)
+  /* HarfBuzz 5 correctly scales bitmap-only fonts without position
+     unit adjustment.
+     (https://github.com/harfbuzz/harfbuzz/issues/489) */
+  if (!hb_version_atleast (5, 0, 0)
+      && ftcrfont_info->bitmap_position_unit)
     *position_unit = ftcrfont_info->bitmap_position_unit;
 
   return hb_font;