[Emacs-diffs] Changes to emacs/lisp/international/mule-util.el [lexbind]

[Miles Bader]

Index: emacs/lisp/international/mule-util.el
diff -c emacs/lisp/international/mule-util.el:1.47.2.1 
emacs/lisp/international/mule-util.el:1.47.2.2
*** emacs/lisp/international/mule-util.el:1.47.2.1      Fri Apr  4 01:20:22 2003
--- emacs/lisp/international/mule-util.el       Tue Oct 14 19:39:23 2003
***************
*** 2,7 ****
--- 2,8 ----
  
  ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
  ;; Licensed to the Free Software Foundation.
+ ;; Copyright (C) 2000, 2002 Free Software Foundation, Inc.
  
  ;; Keywords: mule, multilingual
  
***************
*** 358,363 ****
--- 359,403 ----
                 coding-priority))
        (detect-coding-region from to))))
  
+ ;;;###autoload
+ (defun char-displayable-p (char)
+   "Return non-nil if we should be able to display CHAR.
+ On a multi-font display, the test is only whether there is an
+ appropriate font from the selected frame's fontset to display CHAR's
+ charset in general.  Since fonts may be specified on a per-character
+ basis, this may not be accurate."
+   (cond ((< char 256)
+        ;; Single byte characters are always displayable.
+        t)
+       ((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
+        ;; currently selected frame.
+        (let ((fontset (frame-parameter (selected-frame) 'font))
+              font-pattern)
+          (if (query-fontset fontset)
+              (setq font-pattern (fontset-font fontset char)))
+          (or font-pattern
+              (setq font-pattern (fontset-font "fontset-default" char)))
+          (if font-pattern
+              (progn
+                ;; Now FONT-PATTERN is a string or a cons of family
+                ;; field pattern and registry field pattern.
+                (or (stringp font-pattern)
+                    (setq font-pattern (concat "-"
+                                               (or (car font-pattern) "*")
+                                               "-*-"
+                                               (cdr font-pattern))))
+                (x-list-fonts font-pattern 'default (selected-frame) 1)))))
+       (t
+        (let ((coding (terminal-coding-system)))
+          (if coding
+              (let ((safe-chars (coding-system-get coding 'safe-chars))
+                    (safe-charsets (coding-system-get coding 'safe-charsets)))
+                (or (and safe-chars
+                         (aref safe-chars char))
+                    (and safe-charsets
+                         (memq (char-charset char) safe-charsets)))))))))
  
  (provide 'mule-util)
  
***************
*** 365,368 ****
--- 405,409 ----
  ;; coding: iso-2022-7bit
  ;; End:
  
+ ;;; arch-tag: 5bdb52b6-a3a5-4529-b7a0-37d01b0e570b
  ;;; mule-util.el ends here