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

[Dave Love]

Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.193 
emacs/lisp/international/mule-cmds.el:1.194
*** emacs/lisp/international/mule-cmds.el:1.193 Wed May 22 23:40:16 2002
--- emacs/lisp/international/mule-cmds.el       Mon Jun  3 18:55:26 2002
***************
*** 543,549 ****
  overrides that argument.")
  
  (defun select-safe-coding-system (from to &optional default-coding-system
!                                      accept-default-p)
    "Ask a user to select a safe coding system from candidates.
  The candidates of coding systems which can safely encode a text
  between FROM and TO are shown in a popup window.  Among them, the most
--- 543,549 ----
  overrides that argument.")
  
  (defun select-safe-coding-system (from to &optional default-coding-system
!                                      accept-default-p file)
    "Ask a user to select a safe coding system from candidates.
  The candidates of coding systems which can safely encode a text
  between FROM and TO are shown in a popup window.  Among them, the most
***************
*** 564,569 ****
--- 564,573 ----
  It is called with that coding system, and should return nil if it
  should not be silently selected and thus user interaction is required.
  
+ Optional 5th arg FILE is the file name to use for this purpose.
+ That is different from `buffer-file-name' when handling `write-region'
+ \(for example).
+ 
  The variable `select-safe-coding-system-accept-default-p', if
  non-nil, overrides ACCEPT-DEFAULT-P.
  
***************
*** 718,728 ****
      ;; Check we're not inconsistent with what `coding:' spec &c would
      ;; give when file is re-read.
      (unless (stringp from)
!       (let ((auto-cs (save-restriction
!                      (widen)
!                      (save-excursion
                         (goto-char (point-min))
!                        (set-auto-coding (or buffer-file-name "")
                                          (buffer-size))))))
        (if (and auto-cs
                 (not (coding-system-equal (coding-system-base coding-system)
--- 722,733 ----
      ;; Check we're not inconsistent with what `coding:' spec &c would
      ;; give when file is re-read.
      (unless (stringp from)
!       (let ((auto-cs (save-excursion
!                      (save-restriction
!                        (widen)
!                        (narrow-to-region from to)
                         (goto-char (point-min))
!                        (set-auto-coding (or file buffer-file-name "")
                                          (buffer-size))))))
        (if (and auto-cs
                 (not (coding-system-equal (coding-system-base coding-system)