master 6505ac5c940: Merge from origin/emacs-31

branch: master
commit 6505ac5c940ae15022b225beab3773d13de7edbb
Merge: 2ba20245581 3eb124692d2
Author: Eli Zaretskii <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    Merge from origin/emacs-31
    
    3eb124692d2 Fix 'format-mode-line' for integer second argument
---
 src/xdisp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 95d58455135..14d335fbcc1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -29021,7 +29021,7 @@ are the selected window and the WINDOW's buffer).  */)
   struct window *w;
   struct buffer *old_buffer = NULL;
   int face_id;
-  bool no_props = FIXNUMP (face);
+  bool no_props = INTEGERP (face);
   specpdl_ref count = SPECPDL_INDEX ();
   Lisp_Object str;
   int string_start = 0;