mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-27 10:54:40 +00:00
Code Issues Releases Activity

(url-insert-file-contents): Use the charset info

Browse Source 
provided by the HTTP server, if any.
This commit is contained in:
Stefan Monnier 2005-11-16 19:05:38 +00:00
parent 0a37f51211
commit 77f05e24e8
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/url/ChangeLog
View File

@ -1,9 +1,14 @@
2005-11-16 Juergen Hoetzel <emacs@hoetzel.info> (tiny change)
* url-handlers.el (url-insert-file-contents): Use the charset info
provided by the HTTP server, if any.
2005-10-20 CHENG Gao <chenggao@gmail.com> (tiny change)
* url-nfs.el (top level):
* url-handlers.el (directory-files):
* url-nfs.el (top level):
* url-handlers.el (directory-files):
* url-file.el (top level):
* url-dired.el (url-dired-minor-mode-map):
* url-dired.el (url-dired-minor-mode-map):
* url-http.el (url-http-chunked-encoding-after-change-function):
Remove XEmacs support.

14
lisp/url/url-handlers.el
View File

@ -202,6 +202,7 @@ accessible."
(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 @@ accessible."
(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)