aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorDave Love <[email protected]>2001-03-02 23:51:19 +0000
committerDave Love <[email protected]>2001-03-02 23:51:19 +0000
commit7e365285571e933d7e5d979d77c07f5e3f98b357 (patch)
tree677ed32e3a7aa3cf173687441fc9f368b60a269d /lisp
parentb52b65bdb3e5598b9cd4bf6def4ed2baa7d2312c (diff)
(insert-file-contents-literally): Bind
inhibit-file-name-handlers and inhibit-file-name-operation, not jka-compr-compression-info-list.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/files.el5
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ddd6105cca..1276a6963b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-02 Dave Love <[email protected]>
+
+ * files.el (insert-file-contents-literally): Bind
+ inhibit-file-name-handlers and inhibit-file-name-operation, not
+ jka-compr-compression-info-list.
+
2001-03-02 Stefan Monnier <[email protected]>
* newcomment.el (comment-normalize-vars): Use [ \t] for the trailing
diff --git a/lisp/files.el b/lisp/files.el
index e81a20b769..804f35bb6e 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1178,11 +1178,12 @@ This function ensures that none of these modifications will take place."
(after-insert-file-functions nil)
(coding-system-for-read 'no-conversion)
(coding-system-for-write 'no-conversion)
- (jka-compr-compression-info-list nil)
(find-buffer-file-type-function
(if (fboundp 'find-buffer-file-type)
(symbol-function 'find-buffer-file-type)
- nil)))
+ nil))
+ (inhibit-file-name-handlers '(jka-compr-handler image-file-handler))
+ (inhibit-file-name-operation 'insert-file-contents))
(unwind-protect
(progn
(fset 'find-buffer-file-type (lambda (filename) t))