[Emacs-diffs] Changes to emacs/lisp/term/mac-win.el

[Steven Tamm]

Index: emacs/lisp/term/mac-win.el
diff -c emacs/lisp/term/mac-win.el:1.26 emacs/lisp/term/mac-win.el:1.27
*** emacs/lisp/term/mac-win.el:1.26     Tue Nov 30 15:49:26 2004
--- emacs/lisp/term/mac-win.el  Sat Dec 18 16:36:31 2004
***************
*** 199,205 ****
  (let
      ((encoding-vector (make-vector 256 nil))
       (i 0)
!      (vec     ;; mac-centraleuropean (128..255) -> UCS mapping
        [       #x00C4  ;; 128:LATIN CAPITAL LETTER A WITH DIAERESIS
        #x0100  ;; 129:LATIN CAPITAL LETTER A WITH MACRON
        #x0101  ;; 130:LATIN SMALL LETTER A WITH MACRON
--- 199,205 ----
  (let
      ((encoding-vector (make-vector 256 nil))
       (i 0)
!      (vec     ;; mac-centraleurroman (128..255) -> UCS mapping
        [       #x00C4  ;; 128:LATIN CAPITAL LETTER A WITH DIAERESIS
        #x0100  ;; 129:LATIN CAPITAL LETTER A WITH MACRON
        #x0101  ;; 130:LATIN SMALL LETTER A WITH MACRON
***************
*** 339,346 ****
      (setq i (1+ i)))
    (setq translation-table
        (make-translation-table-from-vector encoding-vector))
! ;;  (define-translation-table 'mac-centraleuropean-decoder translation-table)
!   (define-translation-table 'mac-centraleuropean-encoder
      (char-table-extra-slot translation-table 0)))
  
  (let
--- 339,346 ----
      (setq i (1+ i)))
    (setq translation-table
        (make-translation-table-from-vector encoding-vector))
! ;;  (define-translation-table 'mac-centraleurroman-decoder translation-table)
!   (define-translation-table 'mac-centraleurroman-encoder
      (char-table-extra-slot translation-table 0)))
  
  (let
***************
*** 493,500 ****
  (defvar mac-font-encoder-list
    '(("mac-roman" mac-roman-encoder
       ccl-encode-mac-roman-font "%s")
!     ("mac-centraleuropean" mac-centraleuropean-encoder
!      ccl-encode-mac-centraleuropean-font "%s ce")
      ("mac-cyrillic" mac-cyrillic-encoder
       ccl-encode-mac-cyrillic-font "%s cy")))
  
--- 493,500 ----
  (defvar mac-font-encoder-list
    '(("mac-roman" mac-roman-encoder
       ccl-encode-mac-roman-font "%s")
!     ("mac-centraleurroman" mac-centraleurroman-encoder
!      ccl-encode-mac-centraleurroman-font "%s ce")
      ("mac-cyrillic" mac-cyrillic-encoder
       ccl-encode-mac-cyrillic-font "%s cy")))
  
***************
*** 515,529 ****
            (if mac-encoded
                (aset table c mac-encoded))))))))
  
! (define-ccl-program ccl-encode-mac-centraleuropean-font
    `(0
      (if (r0 != ,(charset-id 'ascii))
        (if (r0 <= ?\x8f)
!           (translate-character mac-centraleuropean-encoder r0 r1)
          ((r1 <<= 7)
           (r1 |= r2)
!          (translate-character mac-centraleuropean-encoder r0 r1)))))
!   "CCL program for Mac Central European font")
  
  (define-ccl-program ccl-encode-mac-cyrillic-font
    `(0
--- 515,529 ----
            (if mac-encoded
                (aset table c mac-encoded))))))))
  
! (define-ccl-program ccl-encode-mac-centraleurroman-font
    `(0
      (if (r0 != ,(charset-id 'ascii))
        (if (r0 <= ?\x8f)
!           (translate-character mac-centraleurroman-encoder r0 r1)
          ((r1 <<= 7)
           (r1 |= r2)
!          (translate-character mac-centraleurroman-encoder r0 r1)))))
!   "CCL program for Mac Central European Roman font")
  
  (define-ccl-program ccl-encode-mac-cyrillic-font
    `(0