Mercurial > emacs
changeset 50884:4d3efb8f1498
(insert-file-contents-literally): Allow it to be called within a magic file name
handler.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Wed, 07 May 2003 21:58:24 +0000 |
| parents | 7b95d60a7574 |
| children | 97867a590ad4 |
| files | lisp/files.el |
| diffstat | 1 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/files.el Wed May 07 21:56:43 2003 +0000 +++ b/lisp/files.el Wed May 07 21:58:24 2003 +0000 @@ -803,7 +803,7 @@ default-coding)) (setq from-coding (read-coding-system (format "Recode filename %s from: " filename)))) - + ;; We provide the default coding only when a user is going to ;; change the encoding not from the default coding. (if (eq from-coding default-coding) @@ -1412,15 +1412,17 @@ (coding-system-for-read 'no-conversion) (coding-system-for-write 'no-conversion) (find-buffer-file-type-function - (if (fboundp 'find-buffer-file-type) - (symbol-function 'find-buffer-file-type) - nil)) - (inhibit-file-name-handlers '(jka-compr-handler image-file-handler)) - (inhibit-file-name-operation 'insert-file-contents)) + (if (fboundp 'find-buffer-file-type) + (symbol-function 'find-buffer-file-type) + nil)) + (inhibit-file-name-handlers + (append '(jka-compr-handler image-file-handler) + inhibit-file-name-handlers)) + (inhibit-file-name-operation 'insert-file-contents)) (unwind-protect - (progn - (fset 'find-buffer-file-type (lambda (filename) t)) - (insert-file-contents filename visit beg end replace)) + (progn + (fset 'find-buffer-file-type (lambda (filename) t)) + (insert-file-contents filename visit beg end replace)) (if find-buffer-file-type-function (fset 'find-buffer-file-type find-buffer-file-type-function) (fmakunbound 'find-buffer-file-type)))))