[Emacs-diffs] Changes to emacs/lisp/files.el

[Juanma Barranquero]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.655 emacs/lisp/files.el:1.656
*** emacs/lisp/files.el:1.655   Tue May  6 01:08:57 2003
--- emacs/lisp/files.el Wed May  7 17:58:24 2003
***************
*** 803,809 ****
                            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)
--- 803,809 ----
                            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,1426 ****
        (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))
      (unwind-protect
!       (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)))))
--- 1412,1428 ----
        (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
!          (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))
        (if find-buffer-file-type-function
          (fset 'find-buffer-file-type find-buffer-file-type-function)
        (fmakunbound 'find-buffer-file-type)))))