[Emacs-diffs] Changes to emacs/lisp/international/mule-cmds.el,v

[Chong Yidong]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/10/05 14:46:26

Index: international/mule-cmds.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/mule-cmds.el,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -b -r1.297 -r1.298
--- international/mule-cmds.el  20 Jul 2006 11:28:14 -0000      1.297
+++ international/mule-cmds.el  5 Oct 2006 14:46:26 -0000       1.298
@@ -216,19 +216,21 @@
                           ((eq eol-type 'dos) 1)
                           ((eq eol-type 'mac) 2)
                           (t eol-type))))
-  (let ((orig-eol-type (coding-system-eol-type coding-system)))
-    (if (vectorp orig-eol-type)
+  ;; We call `coding-system-base' before `coding-system-eol-type',
+  ;; because the coding-system may not be initialized until then.
+  (let* ((base (coding-system-base coding-system))
+        (orig-eol-type (coding-system-eol-type coding-system)))
+    (cond ((vectorp orig-eol-type)
        (if (not eol-type)
            coding-system
-         (aref orig-eol-type eol-type))
-      (let ((base (coding-system-base coding-system)))
-       (if (not eol-type)
-           base
-         (if (= eol-type orig-eol-type)
-             coding-system
-           (setq orig-eol-type (coding-system-eol-type base))
-           (if (vectorp orig-eol-type)
-               (aref orig-eol-type eol-type))))))))
+            (aref orig-eol-type eol-type)))
+         ((not eol-type)
+          base)
+         ((= eol-type orig-eol-type)
+          coding-system)
+         ((progn (setq orig-eol-type (coding-system-eol-type base))
+                 (vectorp orig-eol-type))
+          (aref orig-eol-type eol-type)))))
 
 (defun coding-system-change-text-conversion (coding-system coding)
   "Return a coding system which differs from CODING-SYSTEM in text conversion.