master c2913c30b1 1/5: Merge from origin/emacs-28

[Eli Zaretskii]

branch: master
commit c2913c30b16652c72561ce4dfdf841b5b70e9991
Merge: ef1dfd2261 29085a668e
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-28
    
    # Conflicts:
    #       lisp/startup.el
---
 doc/lispref/display.texi      |  4 +++-
 lisp/international/fontset.el |  2 +-
 lisp/mail/emacsbug.el         |  3 +++
 lisp/startup.el               | 18 +++++++++---------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 4a8694d481..48170348e3 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -6668,7 +6668,9 @@ buffer's text.
 
 The argument @var{slice} specifies a slice of the image to insert.  If
 @var{slice} is @code{nil} or omitted the whole image is inserted.
-Otherwise, @var{slice} is a list @code{(@var{x} @var{y} @var{width}
+(However, note that images are chopped on display at the window's
+right edge, because wrapping images is not supported.)  Otherwise,
+@var{slice} is a list @code{(@var{x} @var{y} @var{width}
 @var{height})} which specifies the @var{x} and @var{y} positions and
 @var{width} and @var{height} of the image area to insert.  Integer
 values are in units of pixels.  A floating-point number in the range
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 2c81bca705..1950a40935 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1141,7 +1141,7 @@ Internal use only.  Should be called at startup time."
 (defconst xlfd-regexp-pointsize-subnum 6)      ; POINT_SIZE
 (defconst xlfd-regexp-resx-subnum 7)           ; RESOLUTION_X
 (defconst xlfd-regexp-resy-subnum 8)           ; RESOLUTION_Y
-(defconst xlfd-regexp-spacing-subnum 8)                ; SPACING
+(defconst xlfd-regexp-spacing-subnum 9)                ; SPACING
 (defconst xlfd-regexp-avgwidth-subnum 10)      ; AVERAGE_WIDTH
 (defconst xlfd-regexp-registry-subnum 11)      ; REGISTRY and ENCODING
 
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index f5559e39f6..1bda609d10 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -304,6 +304,9 @@ usually do not have translators for other languages.\n\n")))
     (emacs-bug--system-description)
     (insert "Configured features:\n" system-configuration-features "\n\n")
     (fill-region (line-beginning-position -1) (point))
+    (when (and (featurep 'native-compile)
+               (null (native-comp-available-p)))
+      (insert "(NATIVE_COMP present but libgccjit not available)\n\n"))
     (insert "Important settings:\n")
     (mapc
      (lambda (var)
diff --git a/lisp/startup.el b/lisp/startup.el
index ad4942b7f7..6b9b8234c7 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -603,16 +603,16 @@ It is the default value of the variable `top-level'."
     (setq user-emacs-directory
          (startup--xdg-or-homedot startup--xdg-config-home-emacs nil))
 
-    (unless (native-comp-available-p)
-      ;; Disable deferred async compilation and trampoline synthesis
-      ;; in this session.  This is necessary if libgccjit is not
-      ;; available on MS-Windows, but Emacs was built with
-      ;; native-compilation support.
-      (setq native-comp-deferred-compilation nil
-            comp-enable-subr-trampolines nil))
-
     (when (featurep 'native-compile)
-      ;; Form the initial value of `native-comp-eln-load-path'.
+      (unless (native-comp-available-p)
+        ;; Disable deferred async compilation and trampoline synthesis
+        ;; in this session.  This is necessary if libgccjit is not
+        ;; available on MS-Windows, but Emacs was built with
+        ;; native-compilation support.
+        (setq native-comp-deferred-compilation nil
+              comp-enable-subr-trampolines nil))
+
+      ;; Form `native-comp-eln-load-path'.
       (let ((path-env (getenv "EMACSNATIVELOADPATH")))
         (when path-env
           (dolist (path (split-string path-env path-separator))