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

[Stefan Monnier]

Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.221 
emacs/lisp/international/mule-cmds.el:1.222
*** emacs/lisp/international/mule-cmds.el:1.221 Tue Feb  4 08:09:38 2003
--- emacs/lisp/international/mule-cmds.el       Thu Feb 13 15:06:36 2003
***************
*** 439,445 ****
                                     (t 32))
                             0))
                         (if (memq base lang-preferred) 8 0)
!                        (if (string-match "-with-esc$" (symbol-name base))
                             0 4)
                         (if (eq (coding-system-type base) 2)
                             ;; For ISO based coding systems, prefer
--- 439,445 ----
                                     (t 32))
                             0))
                         (if (memq base lang-preferred) 8 0)
!                        (if (string-match "-with-esc\\'" (symbol-name base))
                             0 4)
                         (if (eq (coding-system-type base) 2)
                             ;; For ISO based coding systems, prefer
***************
*** 658,664 ****
        (if buffer-file-coding-system
          (let ((base (coding-system-base buffer-file-coding-system)))
            (or (eq base 'undecided)
-               (assq buffer-file-coding-system default-coding-system)
                (rassq base default-coding-system)
                (setq default-coding-system
                      (append default-coding-system
--- 658,663 ----
***************
*** 674,680 ****
        (and (coding-system-p preferred)
             (setq base (coding-system-base preferred))
             (coding-system-get preferred 'mime-charset)
-            (not (assq preferred default-coding-system))
             (not (rassq base default-coding-system))
             (setq default-coding-system
                   (append default-coding-system
--- 673,678 ----
***************
*** 748,753 ****
--- 746,759 ----
                      (eq 'coding-category-iso-8-else
                          (coding-system-category elt)))
            (push elt l))))
+ 
+       ;; Remove raw-text, emacs-mule and no-conversion unless nothing
+       ;; else is available.
+       (setq codings
+           (or (delq 'raw-text
+                     (delq 'emacs-mule
+                           (delq 'no-conversion codings)))
+               '(raw-text emacs-mule no-conversion)))
  
        (let ((window-configuration (current-window-configuration)))
        (save-excursion