mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(find-file-noselect-1): Undo previous change.

Browse source
This commit is contained in:
Richard M. Stallman 2002-06-08 18:28:06 +00:00
parent fe1d72d007
commit f402ba38f5
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lisp/files.el
View file

@ -1286,15 +1286,14 @@ that are visiting the various files."
(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))))
(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,8 +3222,12 @@ non-nil, it is called instead of rereading visited file contents."
(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))))
(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