master 04d5bb486ae: Merge from origin/emacs-31

branch: master
commit 04d5bb486ae87a3162a1a1a35fbf4f1aa357de42
Merge: e2b5dc2d70d 42e283fe9d5
Author: Eli Zaretskii <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    Merge from origin/emacs-31
    
    42e283fe9d5 ; 'use-cjk-char-width-table': Avoid byte-compiler warning.
---
 lisp/international/characters.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index a880577064b..d3024b95cd3 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1724,6 +1724,7 @@ the value of the variable with `setq'."
                               ;; of 'set-locale-environment', so we must
                               ;; test 'initial-window-system' instead.
                               (null initial-window-system)
+                              (boundp 'w32--terminal-is-conhost)
                               (null w32--terminal-is-conhost))))))
           (map-char-table
            (lambda (range _val)