(ange-ftp-write-region): Make sure to record the

last coding system used before calling set-buffer-modified-p
because that function changes last-coding-system.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ed98c45b4c124478b5f0ddaaf26d795d362eff3..7608adc8f893d878d1baff499ab03c79cb1bedfd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-17  Gerd Moellmann  <gerd@gnu.org>
+
+       * net/ange-ftp.el (ange-ftp-write-region): Make sure to record the
+       last coding system used before calling set-buffer-modified-p
+       because that function changes last-coding-system.
+
 2001-05-17  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * files.el (switch-to-buffer-other-window)

diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index e307a7dbfd4f8967b703e583abc769d11334ce4c..9f3a2ed752eba1232921b548bb98be44b01df3d6 100644 (file)
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1,6 +1,7 @@
 ;;; ange-ftp.el --- transparent FTP support for GNU Emacs
 
-;; Copyright (C) 1989,90,91,92,93,94,95,96,98, 00  Free Software Foundation, Inc.
+;; Copyright (C) 1989,90,91,92,93,94,95,96,98, 2000, 2001
+;;  Free Software Foundation, Inc.
 
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com)
 ;; Maintainer: FSF
@@ -3141,12 +3142,13 @@ system TYPE.")
                      (filename (buffer-file-name))
                      (mod-p (buffer-modified-p)))
                  (unwind-protect
-                     (ange-ftp-real-write-region start end temp nil visit)
+                     (progn
+                       (ange-ftp-real-write-region start end temp nil visit)
+                       (setq coding-system-used last-coding-system-used))
                    ;; cleanup forms
+                   (setq coding-system-used last-coding-system-used)
                    (setq buffer-file-name filename)
                    (set-buffer-modified-p mod-p)))
-               ;; save value used by the real write-region
-               (setq coding-system-used last-coding-system-used)
                (if binary
                    (ange-ftp-set-binary-mode host user))