[Emacs-diffs]

[Kenichi Handa]

Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.231 
emacs/lisp/international/mule-cmds.el:1.232
*** emacs/lisp/international/mule-cmds.el:1.231 Fri May 16 00:15:20 2003
--- emacs/lisp/international/mule-cmds.el       Wed May 21 21:48:26 2003
***************
*** 1,5 ****
  ;;; mule-cmds.el --- commands for mulitilingual environment
! ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
  ;; Licensed to the Free Software Foundation.
  ;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  
--- 1,5 ----
  ;;; mule-cmds.el --- commands for mulitilingual environment
! ;; Copyright (C) 1995, 2003 Electrotechnical Laboratory, JAPAN.
  ;; Licensed to the Free Software Foundation.
  ;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  
***************
*** 631,637 ****
  between FROM and TO are shown in a popup window.  Among them, the most
  proper one is suggested as the default.
  
! The list of `buffer-file-coding-system' of the current buffer and the
  most preferred coding system (if it corresponds to a MIME charset) is
  treated as the default coding system list.  Among them, the first one
  that safely encodes the text is normally selected silently and
--- 631,638 ----
  between FROM and TO are shown in a popup window.  Among them, the most
  proper one is suggested as the default.
  
! The list of `buffer-file-coding-system' of the current buffer,
! the `default-buffer-file-coding-system', and the
  most preferred coding system (if it corresponds to a MIME charset) is
  treated as the default coding system list.  Among them, the first one
  that safely encodes the text is normally selected silently and
***************
*** 648,655 ****
  list of coding systems to be prepended to the default coding system
  list.  However, if DEFAULT-CODING-SYSTEM is a list and the first
  element is t, the cdr part is used as the defualt coding system list,
! i.e. `buffer-file-coding-system' and the most prepended coding system
! is not used.
  
  Optional 4th arg ACCEPT-DEFAULT-P, if non-nil, is a function to
  determine the acceptability of the silently selected coding system.
--- 649,656 ----
  list of coding systems to be prepended to the default coding system
  list.  However, if DEFAULT-CODING-SYSTEM is a list and the first
  element is t, the cdr part is used as the defualt coding system list,
! i.e. `buffer-file-coding-system', `default-buffer-file-coding-system',
! and the most preferred coding system are not used.
  
  Optional 4th arg ACCEPT-DEFAULT-P, if non-nil, is a function to
  determine the acceptability of the silently selected coding system.
***************
*** 679,684 ****
--- 680,688 ----
          (mapcar (function (lambda (x) (cons x (coding-system-base x))))
                  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
        ;; to the defaults.
***************
*** 686,709 ****
          (let ((base (coding-system-base buffer-file-coding-system)))
            (or (eq base 'undecided)
                (rassq base default-coding-system)
!               (setq default-coding-system
!                     (append default-coding-system
!                             (list (cons buffer-file-coding-system base)))))))
  
        ;; If the most preferred coding system has the property mime-charset,
        ;; append it to the defaults.
        (let ((tail coding-category-list)
            preferred base)
!       (while (and tail
!                   (not (setq preferred (symbol-value (car tail)))))
          (setq tail (cdr tail)))
        (and (coding-system-p preferred)
             (setq base (coding-system-base preferred))
             (coding-system-get preferred 'mime-charset)
             (not (rassq base default-coding-system))
!            (setq default-coding-system
!                  (append default-coding-system
!                          (list (cons preferred base))))))))
  
    (if select-safe-coding-system-accept-default-p
        (setq accept-default-p select-safe-coding-system-accept-default-p))
--- 690,719 ----
          (let ((base (coding-system-base buffer-file-coding-system)))
            (or (eq base 'undecided)
                (rassq base default-coding-system)
!               (push (cons buffer-file-coding-system base)
!                     default-coding-system))))
! 
!       ;; If default-buffer-file-coding-system is not nil nor undecided,
!       ;; append it to the defaults.
!       (if default-buffer-file-coding-system
!         (let ((base (coding-system-base default-buffer-file-coding-system)))
!           (or (eq base 'undecided)
!               (rassq base default-coding-system)
!               (push (cons default-buffer-file-coding-system base)
!                     default-coding-system))))
  
        ;; If the most preferred coding system has the property mime-charset,
        ;; append it to the defaults.
        (let ((tail coding-category-list)
            preferred base)
!       (while (and tail (not (setq preferred (symbol-value (car tail)))))
          (setq tail (cdr tail)))
        (and (coding-system-p preferred)
             (setq base (coding-system-base preferred))
             (coding-system-get preferred 'mime-charset)
             (not (rassq base default-coding-system))
!            (push (cons preferred base)
!                  default-coding-system)))))
  
    (if select-safe-coding-system-accept-default-p
        (setq accept-default-p select-safe-coding-system-accept-default-p))
***************
*** 724,730 ****
              (push (car elt) safe))
          (push (car elt) unsafe)))
        (if safe
!         (setq coding-system (car (last safe)))))
  
      ;; If all the defaults failed, ask a user.
      (when (not coding-system)
--- 734,740 ----
              (push (car elt) safe))
          (push (car elt) unsafe)))
        (if safe
!         (setq coding-system (car safe))))
  
      ;; If all the defaults failed, ask a user.
      (when (not coding-system)