procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(url-insert-file-contents): Decode contents.

Browse source
This commit is contained in:
Stefan Monnier 2004-09-20 21:27:10 +00:00
parent 46cdaf2476
commit d4fdad607e
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/url/ChangeLog
View file

@ -1,3 +1,7 @@
2004-09-20 Stefan Monnier <monnier@iro.umontreal.ca>
* url-handlers.el (url-insert-file-contents): Decode contents.
2004-04-16 Stefan Monnier <monnier@iro.umontreal.ca>
* url-util.el (url-debug): Use with-current-buffer.

21
lisp/url/url-handlers.el
View file

@ -1,6 +1,6 @@
;;; url-handlers.el --- file-name-handler stuff for URL loading
;; Copyright (c) 1996,97,98,1999,2004 Free Software Foundation, Inc.
;; Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
;; Copyright (c) 1993 - 1996 by William M. Perry <wmperry@cs.indiana.edu>
;; Keywords: comm, data, processes, hypermedia
@ -170,8 +170,7 @@ A prefix arg makes KEEP-TIME non-nil."
(handle nil))
(if (not buffer)
(error "Opening input file: No such file or directory, %s" url))
(save-excursion
(set-buffer buffer)
(with-current-buffer buffer
(setq handle (mm-dissect-buffer t)))
(mm-save-part-to-file handle newname)
(kill-buffer buffer)
@ -194,18 +193,22 @@ accessible."
(if (not buffer)
(error "Opening input file: No such file or directory, %s" url))
(if visit (setq buffer-file-name url))
(save-excursion
(set-buffer buffer)
(with-current-buffer buffer
(setq handle (mm-dissect-buffer t))
(set-buffer (mm-handle-buffer handle))
(if beg
(setq data (buffer-substring beg end))
(setq data (buffer-string))))
(setq data (if beg (buffer-substring beg end)
(buffer-string))))
(kill-buffer buffer)
(mm-destroy-parts handle)
(if replace (delete-region (point-min) (point-max)))
(save-excursion
(insert data))
(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) buffer-file-name visit beg end replace)))
(list url (length data))))
(defun url-file-name-completion (url directory)