diff options
| author | Stefan Monnier | 2004-10-06 15:56:41 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2004-10-06 15:56:41 +0000 |
| commit | ccd59305b4aedca7ef3daca250408879fa64eabf (patch) | |
| tree | 9c7d34a76407f95b1d3c731db90d6984e62f359b | |
| parent | c3bc41c2d82fa7dea41f27e800ca4d9addb6bf89 (diff) | |
| download | emacs-ccd59305b4aedca7ef3daca250408879fa64eabf.tar.gz emacs-ccd59305b4aedca7ef3daca250408879fa64eabf.zip | |
(url-insert-file-contents): Use the URL to decide the
encoding, not the buffer-file-name (which might not even exist).
| -rw-r--r-- | lisp/url/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/url/url-handlers.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 69851ac5046..0da4297bb86 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2004-10-06 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * url-handlers.el (url-insert-file-contents): Use the URL to decide the | ||
| 4 | encoding, not the buffer-file-name (which might not even exist). | ||
| 5 | |||
| 1 | 2004-09-20 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2004-09-20 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * url-handlers.el (url-insert-file-contents): Decode contents. | 8 | * url-handlers.el (url-insert-file-contents): Decode contents. |
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el index 56497b00119..18a2e273637 100644 --- a/lisp/url/url-handlers.el +++ b/lisp/url/url-handlers.el | |||
| @@ -208,7 +208,7 @@ accessible." | |||
| 208 | ;; annotation which we could use as a hint of the locale in use | 208 | ;; annotation which we could use as a hint of the locale in use |
| 209 | ;; at the remote site. Not sure how/if that should be done. --Stef | 209 | ;; at the remote site. Not sure how/if that should be done. --Stef |
| 210 | (decode-coding-inserted-region | 210 | (decode-coding-inserted-region |
| 211 | start (point) buffer-file-name visit beg end replace))) | 211 | start (point) url visit beg end replace))) |
| 212 | (list url (length data)))) | 212 | (list url (length data)))) |
| 213 | 213 | ||
| 214 | (defun url-file-name-completion (url directory) | 214 | (defun url-file-name-completion (url directory) |