(char-displayable-p): Return nil for unibyte mode.

diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 1700c315187f7e599e8bc3cc16323b7be19911e9..682b850c2d8252bc16bf645985a3bcae49cad682 100644 (file)
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
-;; Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2002, 2004  Free Software Foundation, Inc.
 
 ;; Keywords: mule, multilingual
 
@@ -356,6 +356,9 @@ basis, this may not be accurate."
   (cond ((< char 256)
         ;; Single byte characters are always displayable.
         t)
+       ((not enable-multibyte-characters)
+        ;; Maybe there's a font for it, but we can't put it in the buffer.
+        nil)
        ((display-multi-font-p)
         ;; On a window system, a character is displayable if we have
         ;; a font for that character in the default face of the
@@ -377,5 +380,5 @@ basis, this may not be accurate."
 ;; coding: iso-2022-7bit
 ;; End:
 
-;;; arch-tag: 5bdb52b6-a3a5-4529-b7a0-37d01b0e570b
+;; arch-tag: 5bdb52b6-a3a5-4529-b7a0-37d01b0e570b
 ;;; mule-util.el ends here