[Emacs-diffs] Changes to emacs/lisp/international/latin1-disp.el

[Dave Love]

Index: emacs/lisp/international/latin1-disp.el
diff -c emacs/lisp/international/latin1-disp.el:1.14 
emacs/lisp/international/latin1-disp.el:1.15
*** emacs/lisp/international/latin1-disp.el:1.14        Mon Sep  1 11:45:28 2003
--- emacs/lisp/international/latin1-disp.el     Mon Sep  1 14:46:41 2003
***************
*** 106,112 ****
    (if sets
        (progn
        (mapc #'latin1-display-setup sets)
!       (unless (latin1-char-displayable-p
                 (make-char 'mule-unicode-0100-24ff 32 33))
          ;; It doesn't look as though we have a Unicode font.
          (map-char-table
--- 106,112 ----
    (if sets
        (progn
        (mapc #'latin1-display-setup sets)
!       (unless (char-displayable-p
                 (make-char 'mule-unicode-0100-24ff 32 33))
          ;; It doesn't look as though we have a Unicode font.
          (map-char-table
***************
*** 221,267 ****
        (setq language 'cyrillic-iso))
    (let* ((info (get-language-info language 'charset))
         (char (and info (make-char (car (remq 'ascii info)) ?\ ))))
!     (and char (latin1-char-displayable-p char))))
  
! ;; This should be moved into mule-utils or somewhere after 21.1.
! (defun latin1-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)))))))))
  
  (defun latin1-display-setup (set &optional force)
    "Set up Latin-1 display for characters in the given SET.
--- 221,231 ----
        (setq language 'cyrillic-iso))
    (let* ((info (get-language-info language 'charset))
         (char (and info (make-char (car (remq 'ascii info)) ?\ ))))
!     (and char (char-displayable-p char))))
  
! ;; Backwards compatibility.
! (defalias 'latin1-char-displayable-p 'char-displayable-p)
! (make-obsolete 'latin1-char-displayable-p 'char-displayable-p "21.5")
  
  (defun latin1-display-setup (set &optional force)
    "Set up Latin-1 display for characters in the given SET.
***************
*** 826,832 ****
  is't changed if the display can render Unicode characters."
    (interactive "p")
    (if (> arg 0)
!       (unless (latin1-char-displayable-p
               (make-char 'mule-unicode-0100-24ff 32 33))
        ;; It doesn't look as though we have a Unicode font.
        (let ((latin1-display-format "%s"))
--- 790,796 ----
  is't changed if the display can render Unicode characters."
    (interactive "p")
    (if (> arg 0)
!       (unless (char-displayable-p
               (make-char 'mule-unicode-0100-24ff 32 33))
        ;; It doesn't look as though we have a Unicode font.
        (let ((latin1-display-format "%s"))
***************
*** 3245,3252 ****
             (?\$,3sc(B "\"")
             (?\$,3sd(B ",")
             ;; Not from Lynx
!            (?$,3r_(B . "")
!            (?$,3u=(B . "?")))))
      (aset standard-display-table
          (make-char 'mule-unicode-0100-24ff) nil)
      (aset standard-display-table
--- 3209,3216 ----
             (?\$,3sc(B "\"")
             (?\$,3sd(B ",")
             ;; Not from Lynx
!            (?$,3r_(B "")
!            (?$,3u=(B "?")))))
      (aset standard-display-table
          (make-char 'mule-unicode-0100-24ff) nil)
      (aset standard-display-table