(insert-file-contents-literally): Allow it to be called within a magic file name

handler.

1 files changed, 11 insertions, 9 deletions

diff --git a/lisp/files.el b/lisp/files.el
index cd94fc7cd8c..b7553f1a886 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -803,7 +803,7 @@ use with M-x."
                             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 @@ This function ensures that none of these modifications will take place."
         (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)))))