url-insert-file-contents does not use charset from a http-header

url-insert-file-contents does not use charset from a http-header

[Juergen Hoetzel]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

Hi,

I'm using emacs-cvs. Try to insert:

(url-insert-file-contents "http://www.hoetzel.info/test")

I changed url-insert-file-contents to use the charset supplied in a
response. Patch enclosed.

Jürgen

[-- Attachment #2: url-insert-file-contents-charset.patch --]
[-- Type: text/plain, Size: 1230 bytes --]

--- url-handlers.el.orig	2005-11-13 11:53:46.000000000 +0100
+++ url-handlers.el	2005-11-13 03:12:18.000000000 +0100
@@ -202,6 +202,7 @@
 (defun url-insert-file-contents (url &optional visit beg end replace)
   (let ((buffer (url-retrieve-synchronously url))
 	(handle nil)
+	(charset nil)
 	(data nil))
     (if (not buffer)
 	(error "Opening input file: No such file or directory, %s" url))
@@ -215,13 +216,14 @@
     (mm-destroy-parts handle)
     (if replace (delete-region (point-min) (point-max)))
     (save-excursion
+      (setq charset (mail-content-type-get (mm-handle-type handle)
+					     'charset))
       (let ((start (point)))
-	(insert data)
-	;; FIXME: for text/plain data, we sometimes receive a `charset'
-	;; 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) url visit beg end replace)))
+	(if charset
+	    (insert (mm-decode-string data (mm-charset-to-coding-system charset)))
+	  (progn
+	    (insert data)
+	    (decode-coding-inserted-region start (point) url visit beg end replace)))))
     (list url (length data))))
 
 (defun url-file-name-completion (url directory)

[-- Attachment #3: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel

Re: url-insert-file-contents does not use charset from a http-header

[Stefan Monnier]

> I'm using emacs-cvs. Try to insert:

> (url-insert-file-contents "http://www.hoetzel.info/test")

> I changed url-insert-file-contents to use the charset supplied in a
> response. Patch enclosed.

Installed, thank you,


        Stefan

Re: url-insert-file-contents does not use charset from a http-header

[Klaus Straubinger]

>> I'm using emacs-cvs. Try to insert:
>
>> (url-insert-file-contents "http://www.hoetzel.info/test")
>
>> I changed url-insert-file-contents to use the charset supplied in a
>> response. Patch enclosed.
>
> Installed, thank you,
>
>
>         Stefan

For me, this leads to strange \201 characters in the buffer where the
insert takes place. I tested it with the URL "http://www.heise.de/"
which specifies the iso-8859-1 charset.

-- 
Klaus Straubinger

Re: url-insert-file-contents does not use charset from a http-header

[Stefan Monnier]

> For me, this leads to strange \201 characters in the buffer where the
> insert takes place. I tested it with the URL "http://www.heise.de/"
> which specifies the iso-8859-1 charset.

It worked correctly for me.  Can you give a precise recipe?


        Stefan

Re: url-insert-file-contents does not use charset from a http-header

[Klaus Straubinger]

Hallo Stefan,

>> For me, this leads to strange \201 characters in the buffer where the
>> insert takes place. I tested it with the URL "http://www.heise.de/"
>> which specifies the iso-8859-1 charset.
>
> It worked correctly for me.  Can you give a precise recipe?

Create a new buffer in the UTF-8 coding system and call the function with
the URL given above.

I should mention that I used Emacs 21.4. Maybe the mm-... functions
that are called inside make the difference.

-- 
Klaus Straubinger

Re: url-insert-file-contents does not use charset from a http-header

[Stefan Monnier]

> Create a new buffer in the UTF-8 coding system and call the function with
> the URL given above.

> I should mention that I used Emacs 21.4. Maybe the mm-... functions
> that are called inside make the difference.

Yes, please try to reproduce it with Emacs-CVS.


        Stefan