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

[Stefan Monnier]

Index: emacs/lisp/url/url-handlers.el
diff -c emacs/lisp/url/url-handlers.el:1.14 emacs/lisp/url/url-handlers.el:1.15
*** emacs/lisp/url/url-handlers.el:1.14 Thu Oct 20 14:17:14 2005
--- emacs/lisp/url/url-handlers.el      Wed Nov 16 19:05:37 2005
***************
*** 202,207 ****
--- 202,208 ----
  (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,227 ****
      (mm-destroy-parts handle)
      (if replace (delete-region (point-min) (point-max)))
      (save-excursion
        (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)))
      (list url (length data))))
  
  (defun url-file-name-completion (url directory)
--- 216,229 ----
      (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)))
!       (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)