[Emacs-diffs] Changes to emacs/lisp/language/cyrillic.el

[Dave Love]

Index: emacs/lisp/language/cyrillic.el
diff -c emacs/lisp/language/cyrillic.el:1.33 
emacs/lisp/language/cyrillic.el:1.34
*** emacs/lisp/language/cyrillic.el:1.33        Wed Sep 11 17:07:00 2002
--- emacs/lisp/language/cyrillic.el     Mon Sep 30 02:34:40 2002
***************
*** 42,48 ****
  ;; Alternativnyj coding systems encode both 8859-5 and Unicode.
  ;; ucs-tables.el provides unification for cyrillic-iso-8bit.
  
! ;; Customizing `utf-8-fragment-on-decoding' allows decoding characters
  ;; from KOI and Alternativnyj into 8859-5 where that's possible.
  ;; cyrillic-iso8859-5 characters take half as much space in the buffer
  ;; as the mule-unicode-0100-24ff equivalents, though that's probably
--- 42,48 ----
  ;; Alternativnyj coding systems encode both 8859-5 and Unicode.
  ;; ucs-tables.el provides unification for cyrillic-iso-8bit.
  
! ;; Customizing `utf-fragment-on-decoding' allows decoding characters
  ;; from KOI and Alternativnyj into 8859-5 where that's possible.
  ;; cyrillic-iso8859-5 characters take half as much space in the buffer
  ;; as the mule-unicode-0100-24ff equivalents, though that's probably
***************
*** 130,136 ****
        (if (r1 < 128)
          (write-repeat r1)
        ((translate-character cyrillic-koi8-r-nonascii-translation-table r0 r1)
!        (translate-character utf-8-translation-table-for-decode r0 r1)
         (write-multibyte-character r0 r1)
         (repeat))))))
    "CCL program to decode KOI8-R.")
--- 130,136 ----
        (if (r1 < 128)
          (write-repeat r1)
        ((translate-character cyrillic-koi8-r-nonascii-translation-table r0 r1)
!        (translate-character ucs-translation-table-for-decode r0 r1)
         (write-multibyte-character r0 r1)
         (repeat))))))
    "CCL program to decode KOI8-R.")
***************
*** 145,151 ****
  
  (defun cyrillic-unify-encoding (table)
    "Set up equivalent characters in the encoding TABLE.
! This works wheher or not the table is is Unicode-based or
  8859-5-based.  (Only appropriate for Cyrillic.)"
    (let ((table (get table 'translation-table)))
      (dotimes (i 96)
--- 145,151 ----
  
  (defun cyrillic-unify-encoding (table)
    "Set up equivalent characters in the encoding TABLE.
! This works whether or not the table is Unicode-based or
  8859-5-based.  (Only appropriate for Cyrillic.)"
    (let ((table (get table 'translation-table)))
      (dotimes (i 96)
***************
*** 175,181 ****
   '(ccl-decode-koi8 . ccl-encode-koi8)
   `((safe-chars . cyrillic-koi8-r-encode-table)
     (mime-charset . koi8-r)
!    (valid-codes (0 . 255))))
  
  (define-coding-system-alias 'koi8-r 'cyrillic-koi8)
  (define-coding-system-alias 'koi8 'cyrillic-koi8)
--- 175,182 ----
   '(ccl-decode-koi8 . ccl-encode-koi8)
   `((safe-chars . cyrillic-koi8-r-encode-table)
     (mime-charset . koi8-r)
!    (valid-codes (0 . 255))
!    (dependency unify-8859-on-encoding-mode unify-8859-on-decoding-mode)))
  
  (define-coding-system-alias 'koi8-r 'cyrillic-koi8)
  (define-coding-system-alias 'koi8 'cyrillic-koi8)
***************
*** 266,272 ****
        (if (r1 < 128)
          (write-repeat r1)
        ((translate-character cyrillic-koi8-u-nonascii-translation-table r0 r1)
!        (translate-character utf-8-translation-table-for-decode r0 r1)
         (write-multibyte-character r0 r1)
         (repeat))))))
    "CCL program to decode KOI8-U.")
--- 267,273 ----
        (if (r1 < 128)
          (write-repeat r1)
        ((translate-character cyrillic-koi8-u-nonascii-translation-table r0 r1)
!        (translate-character ucs-translation-table-for-decode r0 r1)
         (write-multibyte-character r0 r1)
         (repeat))))))
    "CCL program to decode KOI8-U.")
***************
*** 287,293 ****
   '(ccl-decode-koi8-u . ccl-encode-koi8-u)
   `((safe-chars . cyrillic-koi8-u-encode-table)
     (mime-charset . koi8-u)
!    (valid-codes (0 . 255))))
  
  (define-ccl-program ccl-encode-koi8-u-font
    `(0
--- 288,295 ----
   '(ccl-decode-koi8-u . ccl-encode-koi8-u)
   `((safe-chars . cyrillic-koi8-u-encode-table)
     (mime-charset . koi8-u)
!    (valid-codes (0 . 255))
!    (dependency unify-8859-on-encoding-mode unify-8859-on-decoding-mode)))
  
  (define-ccl-program ccl-encode-koi8-u-font
    `(0
***************
*** 298,311 ****
  
  (set-language-info-alist
   "Ukrainian" `((coding-system koi8-u)
!             (coding-priority koi8-u)
               (nonascii-translation
                . ,(get 'cyrillic-koi8-u-nonascii-translation-table
                        'translation-table))
               (input-method . "ukrainian-computer")
!             (features code-pages)
!             (documentation
!              . "Support for Ukrainian with KOI8-U character set."))
   '("Cyrillic"))
  
  ;;; ALTERNATIVNYJ stuff
--- 300,313 ----
  
  (set-language-info-alist
   "Ukrainian" `((coding-system koi8-u)
!              (coding-priority koi8-u)
               (nonascii-translation
                . ,(get 'cyrillic-koi8-u-nonascii-translation-table
                        'translation-table))
               (input-method . "ukrainian-computer")
!              (features code-pages)
!              (documentation
!               . "Support for Ukrainian with KOI8-U character set."))
   '("Cyrillic"))
  
  ;;; ALTERNATIVNYJ stuff
***************
*** 360,366 ****
          (write-repeat r1)
        ((translate-character cyrillic-alternativnyj-nonascii-translation-table
                              r0 r1)
!        (translate-character utf-8-translation-table-for-decode r0 r1)
         (write-multibyte-character r0 r1)
         (repeat))))))
    "CCL program to decode Alternativnyj.")
--- 362,368 ----
          (write-repeat r1)
        ((translate-character cyrillic-alternativnyj-nonascii-translation-table
                              r0 r1)
!        (translate-character ucs-translation-table-for-decode r0 r1)
         (write-multibyte-character r0 r1)
         (repeat))))))
    "CCL program to decode Alternativnyj.")
***************
*** 383,389 ****
   '(ccl-decode-alternativnyj . ccl-encode-alternativnyj)
   `((safe-chars . cyrillic-alternativnyj-encode-table)
     (valid-codes (0 . 255))
!    (mime-charset . cp866)))
  
  (define-coding-system-alias 'alternativnyj 'cyrillic-alternativnyj)
  (define-coding-system-alias 'cp866 'cyrillic-alternativnyj)
--- 385,392 ----
   '(ccl-decode-alternativnyj . ccl-encode-alternativnyj)
   `((safe-chars . cyrillic-alternativnyj-encode-table)
     (valid-codes (0 . 255))
!    (mime-charset . cp866)
!    (dependency unify-8859-on-encoding-mode unify-8859-on-decoding-mode)))
  
  (define-coding-system-alias 'alternativnyj 'cyrillic-alternativnyj)
  (define-coding-system-alias 'cp866 'cyrillic-alternativnyj)