[Emacs-diffs] Changes to emacs/lisp/international/code-pages.el

[Kenichi Handa]

Index: emacs/lisp/international/code-pages.el
diff -c emacs/lisp/international/code-pages.el:1.27 
emacs/lisp/international/code-pages.el:1.28
*** emacs/lisp/international/code-pages.el:1.27 Fri May 13 06:03:44 2005
--- emacs/lisp/international/code-pages.el      Fri May 27 11:20:16 2005
***************
*** 193,207 ****
              ;; a separate table that only translates the coding
              ;; system's safe-chars.
              (cons 'translation-table-for-input 'ucs-mule-to-mule-unicode)))
!        (push (list ',name
!                  nil                  ; charset list
!                  ',decoder
!                  (let (l)             ; code range
!                    (dolist (elt (reverse codes))
!                      (push (cdr elt) l)
!                      (push (car elt) l))
!                    (list l)))
!            non-iso-charset-alist))))
  
  (eval-when-compile (defvar non-iso-charset-alist))
  
--- 193,210 ----
              ;; a separate table that only translates the coding
              ;; system's safe-chars.
              (cons 'translation-table-for-input 'ucs-mule-to-mule-unicode)))
!        (let ((slot (assq ',name non-iso-charset-alist))
!            (elt (list nil                     ; charset list
!                       ',decoder
!                       (let (l)                ; code range
!                         (dolist (elt (reverse codes))
!                           (push (cdr elt) l)
!                           (push (car elt) l))
!                         (list l)))))
!        (if (not slot)
!            (push (cons ',name elt) non-iso-charset-alist)
!          (setcdr slot elt)
!          non-iso-charset-alist)))))
  
  (eval-when-compile (defvar non-iso-charset-alist))
  
***************
*** 4502,4512 ****
      ;; Define cp125* as aliases for all windows-125*, so on Windows
      ;; we can just concat "cp" to the ANSI codepage we get from the system
      ;; and not have to worry about whether it should be "cp" or "windows-".
!     (if (coding-system-p w)
!       (define-coding-system-alias c w))
!     ;; Compatibility with codepage.el, though cp... are not the
!     ;; canonical names.
!     (push (assoc w non-iso-charset-alist) non-iso-charset-alist)))
  
  (provide 'code-pages)
  
--- 4505,4518 ----
      ;; Define cp125* as aliases for all windows-125*, so on Windows
      ;; we can just concat "cp" to the ANSI codepage we get from the system
      ;; and not have to worry about whether it should be "cp" or "windows-".
!     (when (coding-system-p w)
!       (define-coding-system-alias c w)
!       ;; Compatibility with codepage.el, though cp... are not the
!       ;; canonical names.
!       (if (not (assq c non-iso-charset-alist))
!         (let ((slot (assq w non-iso-charset-alist)))
!           (if slot
!               (push (cons c (cdr slot)) non-iso-charset-alist)))))))
  
  (provide 'code-pages)