[Emacs-diffs] Changes to emacs/lisp/files.el

[Kenichi Handa]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.735 emacs/lisp/files.el:1.736
*** emacs/lisp/files.el:1.735   Thu Dec 30 01:49:12 2004
--- emacs/lisp/files.el Thu Dec 30 12:42:11 2004
***************
*** 3238,3244 ****
    (if save-buffer-coding-system
        (let ((coding-system-for-write save-buffer-coding-system))
        (basic-save-buffer-2))
!     (basic-save-buffer-2)))
  
  ;; This returns a value (MODES . BACKUPNAME), like backup-buffer.
  (defun basic-save-buffer-2 ()
--- 3238,3245 ----
    (if save-buffer-coding-system
        (let ((coding-system-for-write save-buffer-coding-system))
        (basic-save-buffer-2))
!     (basic-save-buffer-2))
!   (setq explicit-buffer-file-coding-system last-coding-system-used))
  
  ;; This returns a value (MODES . BACKUPNAME), like backup-buffer.
  (defun basic-save-buffer-2 ()
***************
*** 3708,3718 ****
                         (unlock-buffer)))
                   (widen)
                   (let ((coding-system-for-read
!                         ;; Auto-saved file shoule be read without
!                         ;; any code conversion.
!                         (if auto-save-p 'emacs-mule-unix
                            (or coding-system-for-read
!                               buffer-file-coding-system))))
                     ;; This force after-insert-file-set-coding
                     ;; (called from insert-file-contents) to set
                     ;; buffer-file-coding-system to a proper value.
--- 3709,3719 ----
                         (unlock-buffer)))
                   (widen)
                   (let ((coding-system-for-read
!                         ;; Auto-saved file shoule be read by Emacs'
!                         ;; internal coding.
!                         (if auto-save-p 'auto-save-coding
                            (or coding-system-for-read
!                               explicit-buffer-file-coding-system))))
                     ;; This force after-insert-file-set-coding
                     ;; (called from insert-file-contents) to set
                     ;; buffer-file-coding-system to a proper value.