(url-insert-file-contents): Use the URL to decide the

encoding, not the buffer-file-name (which might not even exist).

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 69851ac..0da4297 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * url-handlers.el (url-insert-file-contents): Use the URL to decide the
+       encoding, not the buffer-file-name (which might not even exist).
+
 2004-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * url-handlers.el (url-insert-file-contents): Decode contents.

diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 56497b0..18a2e27 100644 (file)
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -208,7 +208,7 @@ accessible."
        ;; annotation which we could use as a hint of the locale in use
        ;; at the remote site.  Not sure how/if that should be done.  --Stef
        (decode-coding-inserted-region
-        start (point) buffer-file-name visit beg end replace)))
+        start (point) url visit beg end replace)))
     (list url (length data))))
 
 (defun url-file-name-completion (url directory)