Mercurial > hg > xemacs-beta

diff lisp/files.el @ 4024:f901409b074b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2007-06-21 23:27:13 by aidan] Pass the NOMODIFY argument to s-b-f-c-s in a few more cases.
author aidan
date Thu, 21 Jun 2007 23:27:16 +0000
parents cee87f8de64b
children 346788f5aa64
line wrap: on
line diff
--- a/lisp/files.el	Thu Jun 21 21:51:24 2007 +0000
+++ b/lisp/files.el	Thu Jun 21 23:27:16 2007 +0000
@@ -3473,7 +3473,7 @@
 				   (coding-system-base
 				    buffer-file-coding-system-when-loaded)
 				 buffer-file-coding-system-when-loaded)
-			       (not adjust-eol))))))
+			       (not adjust-eol) t)))))
 		      (goto-char (min opoint (point-max)))
 		      ;; Recompute the truename in case changes in symlinks
 		      ;; have changed the truename.
@@ -3616,7 +3616,8 @@
 			      (coding-system-for-read 'escape-quoted))
 			  (erase-buffer)
 			  (insert-file-contents file-name nil)
-			  (set-buffer-file-coding-system coding-system))
+			  (set-buffer-file-coding-system coding-system
+                                                         nil t))
 			(after-find-file nil nil t)
 			(return nil))
 		       (diff