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

[Kenichi Handa]

Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.242.2.2 
emacs/lisp/international/mule-cmds.el:1.242.2.3
*** emacs/lisp/international/mule-cmds.el:1.242.2.2     Mon Nov 24 03:29:16 2003
--- emacs/lisp/international/mule-cmds.el       Tue Nov 25 08:03:14 2003
***************
*** 702,723 ****
        (coding-system nil)
        (bufname (buffer-name))
        safe rejected unsafe)
!     (if (eq (car codings) 'undecided)
!       ;; Any coding system is ok.
!       (setq coding-system t)
!       ;; Classify the defaults into safe, rejected, and unsafe.
!       (dolist (elt default-coding-system)
!       (if (memq (cdr elt) codings)
!           (if (and (functionp accept-default-p)
!                    (not (funcall accept-default-p (cdr elt))))
!               (push (car elt) rejected)
!             (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)
        ;; At first, if some defaults are unsafe, record at most 11
        ;; problematic characters and their positions for them by turning
        ;;      (CODING ...)
--- 702,721 ----
        (coding-system nil)
        (bufname (buffer-name))
        safe rejected unsafe)
!     ;; Classify the defaults into safe, rejected, and unsafe.
!     (dolist (elt default-coding-system)
!       (if (or (eq (car codings) 'undecided)
!             (memq (cdr elt) codings))
!         (if (and (functionp accept-default-p)
!                  (not (funcall accept-default-p (cdr elt))))
!             (push (car elt) rejected)
!           (push (car elt) safe))
!       (push (car elt) unsafe)))
!     (if safe
!       (setq coding-system (car safe)))
  
      ;; If all the defaults failed, ask a user.
!     (unless coding-system
        ;; At first, if some defaults are unsafe, record at most 11
        ;; problematic characters and their positions for them by turning
        ;;      (CODING ...)
***************
*** 860,866 ****
  The first problematic character is at point in the displayed buffer,\n"
                          (substitute-command-keys "\
  and \\[universal-argument] \\[what-cursor-position] will give information 
about it.\n"))))
!             (insert (if safe
                          "\nSelect the above, or "
                        "\nSelect ")
                      "\
--- 858,864 ----
  The first problematic character is at point in the displayed buffer,\n"
                          (substitute-command-keys "\
  and \\[universal-argument] \\[what-cursor-position] will give information 
about it.\n"))))
!             (insert (if rejected
                          "\nSelect the above, or "
                        "\nSelect ")
                      "\
***************
*** 886,899 ****
        (kill-buffer "*Warning*")
        (set-window-configuration window-configuration)))
  
!     (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.
      ;; But don't do this if we explicitly ignored the cookie
--- 884,895 ----
        (kill-buffer "*Warning*")
        (set-window-configuration window-configuration)))
  
!     (if (and coding-system (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)))))
  
      ;; Check we're not inconsistent with what `coding:' spec &c would
      ;; give when file is re-read.
      ;; But don't do this if we explicitly ignored the cookie