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

[Richard M. Stallman]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.580 emacs/lisp/files.el:1.581
*** emacs/lisp/files.el:1.580   Sat Jun  1 14:04:35 2002
--- emacs/lisp/files.el Sat Jun  8 14:27:16 2002
***************
*** 1286,1300 ****
           (progn
             (make-local-variable 'backup-inhibited)
             (setq backup-inhibited t)))
!       (let ((buffer (current-buffer)))
!       (if rawfile
!           (progn
!             (set-buffer-multibyte nil)
!             (setq buffer-file-coding-system 'no-conversion)
!             (make-local-variable 'find-file-literally)
!             (setq find-file-literally t))
!         (after-find-file error (not nowarn)))
!       buffer))))
  
  (defun insert-file-contents-literally (filename &optional visit beg end 
replace)
    "Like `insert-file-contents', but only reads in the file literally.
--- 1286,1299 ----
           (progn
             (make-local-variable 'backup-inhibited)
             (setq backup-inhibited t)))
!       (if rawfile
!         (progn
!           (set-buffer-multibyte nil)
!           (setq buffer-file-coding-system 'no-conversion)
!           (make-local-variable 'find-file-literally)
!           (setq find-file-literally t))
!       (after-find-file error (not nowarn)))
!       (current-buffer))))
  
  (defun insert-file-contents-literally (filename &optional visit beg end 
replace)
    "Like `insert-file-contents', but only reads in the file literally.
***************
*** 3223,3230 ****
                          (if auto-save-p 'emacs-mule-unix
                            coding-system-for-read)))
                     ;; Note that this preserves point in an intelligent way.
!                    (insert-file-contents file-name (not auto-save-p)
!                                          nil nil t))))
               ;; Recompute the truename in case changes in symlinks
               ;; have changed the truename.
               (setq buffer-file-truename
--- 3222,3233 ----
                          (if auto-save-p 'emacs-mule-unix
                            coding-system-for-read)))
                     ;; Note that this preserves point in an intelligent way.
!                    (if preserve-modes
!                        (let ((buffer-file-formats buffer-file-formats))
!                          (insert-file-contents file-name (not auto-save-p)
!                                                nil nil t))
!                      (insert-file-contents file-name (not auto-save-p)
!                                            nil nil t)))))
               ;; Recompute the truename in case changes in symlinks
               ;; have changed the truename.
               (setq buffer-file-truename