Changeset 4131 for trunk/lisp/international/mule-cmds.el

Timestamp:

2006年07月29日 07時48分34秒 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/international/mule-cmds.el (modified) (7 diffs)

trunk/lisp/international/mule-cmds.el

@@ -832 +832 @@
-list of coding systems to be prepended to the default coding system
-list.  However, if DEFAULT-CODING-SYSTEM is a list and the first
-ua
+au
-i.e. `buffer-file-coding-system', `default-buffer-file-coding-system',
-and the most preferred coding system are not used.
@@ -899 +899 @@
-              (push (cons auto-cs base) default-coding-system))))
-
-    ;; From now on, the list of defaults is reversed.
-    (setq default-coding-system (nreverse default-coding-system))
-
-    (unless no-other-defaults
-      ;; If buffer-file-coding-system is not nil nor undecided, append it
@@ -909 +906 @@
-            (or (eq base 'undecided)
-                (rassq base default-coding-system)
-
-
+
+
+
-
-      ;; If default-buffer-file-coding-system is not nil nor undecided,
@@ -918 +916 @@
-            (or (eq base 'undecided)
-                (rassq base default-coding-system)
-
-
+
+
+
+
-
-      ;; If the most preferred coding system has the property mime-charset,
@@ -931 +931 @@
-             (coding-system-get preferred 'mime-charset)
-             (not (rassq base default-coding-system))
-
-
+
+
+
-
-    (if select-safe-coding-system-accept-default-p
-        (setq accept-default-p select-safe-coding-system-accept-default-p))
+
+    ;; Decide the eol-type from the top of the default codings,
+    ;; buffer-file-coding-system, or
+    ;; default-buffer-file-coding-system.
+    (if default-coding-system
+        (let ((default-eol-type (coding-system-eol-type
+                                 (caar default-coding-system))))
+          (if (and (vectorp default-eol-type) buffer-file-coding-system)
+              (setq default-eol-type (coding-system-eol-type 
+                                      buffer-file-coding-system)))
+          (if (and (vectorp default-eol-type) default-buffer-file-coding-system)
+              (setq default-eol-type (coding-system-eol-type 
+                                      default-buffer-file-coding-system)))
+          (if (and default-eol-type (not (vectorp default-eol-type)))
+              (dolist (elt default-coding-system)
+                (setcar elt (coding-system-change-eol-conversion
+                             (car elt) default-eol-type))))))
-
-    (let ((codings (find-coding-systems-region from to))
@@ -942 +960 @@
-      (if (eq (car codings) 'undecided)
-          ;; Any coding system is ok.
-
+
+
+
+
+
-        ;; Classify the defaults into safe, rejected, and unsafe.
-        (dolist (elt default-coding-system)
@@ -959 +981 @@
-                             from to codings unsafe rejected (car codings))))
-
-      (if (vectorp (coding-system-eol-type coding-system))
-          (let ((eol (coding-system-eol-type buffer-file-coding-system)))
-            (if (numberp eol)
-                (setq coding-system
-                      (coding-system-change-eol-conversion coding-system eol)))))
-
-      (if (eq coding-system t)
-          (setq coding-system buffer-file-coding-system))
-      ;; Check we're not inconsistent with what `coding:' spec &c would
-      ;; give when file is re-read.