[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.11 
emacs/lisp/international/latin1-disp.el:1.12
*** emacs/lisp/international/latin1-disp.el:1.11        Tue Feb  4 08:09:38 2003
--- emacs/lisp/international/latin1-disp.el     Thu Mar 13 18:00:49 2003
***************
*** 49,55 ****
  
  ;; Ensure `standard-display-table' is set up:
  (require 'disp-table)
- (require 'ucs-tables)
  
  (defconst latin1-display-sets '(latin-2 latin-3 latin-4 latin-5 latin-8
                                latin-9 arabic cyrillic greek hebrew)
--- 49,54 ----
***************
*** 66,72 ****
  (defcustom latin1-display-format "{%s}"
    "A format string used to display the ASCII sequences.
  The default encloses the sequence in braces, but you could just use
! \"%s\" to avoid the braces."
    :group 'latin1-display
    :type 'string)
  
--- 65,72 ----
  (defcustom latin1-display-format "{%s}"
    "A format string used to display the ASCII sequences.
  The default encloses the sequence in braces, but you could just use
! \"%s\" to avoid the braces, maybe with a non-default value of
! `latin1-display-face'."
    :group 'latin1-display
    :type 'string)
  
***************
*** 152,157 ****
--- 152,163 ----
    :type 'boolean
    :group 'latin1-display)
  
+ (defcustom latin1-display-face 'default
+   "Face to use for displaying substituted ASCII sequences."
+   :type 'face
+   :version "21.4"
+   :group 'latin1-display)
+ 
  (defun latin1-display-char (char display &optional alt-display)
    "Make an entry in `standard-display-table' for CHAR using string DISPLAY.
  If ALT-DISPLAY is provided, use that instead if
***************
*** 166,173 ****
           latin1-display-mnemonic)
        (setq display alt-display))
    (if (stringp display)
!       (standard-display-ascii char (format latin1-display-format display))
!     (aset standard-display-table char display)))
  
  (defun latin1-display-identities (charset)
    "Display each character in CHARSET as the corresponding Latin-1 character.
--- 172,188 ----
           latin1-display-mnemonic)
        (setq display alt-display))
    (if (stringp display)
!       (if (eq 'default latin1-display-face)
!         (standard-display-ascii char (format latin1-display-format display))
!       (aset standard-display-table char
!             (vconcat (mapcar (lambda (c)
!                                (logior c (lsh (face-id latin1-display-face)
!                                               19)))
!                              display))))
!     (aset standard-display-table char
!         (if (eq 'default latin1-display-face)
!             display
!           (logior display (lsh (face-id latin1-display-face) 19))))))
  
  (defun latin1-display-identities (charset)
    "Display each character in CHARSET as the corresponding Latin-1 character.