# HG changeset patch
# User aidan
# Date 1182468436 0
# Node ID f901409b074bc69610c185d6d9fce949817d3974
# Parent  27b5d12ddbd71a9136f3296545cf4df6334edd34
[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.

diff -r 27b5d12ddbd7 -r f901409b074b lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jun 21 21:51:24 2007 +0000
+++ b/lisp/ChangeLog	Thu Jun 21 23:27:16 2007 +0000
@@ -1,3 +1,10 @@
+2007-06-22  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* files.el (revert-buffer):
+	* files.el (recover-file):
+	Pass NOMODIFY to set-buffer-file-coding-systems after reverting a
+	buffer and after recovering a file.
+
 2007-06-21  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* msw-faces.el:
diff -r 27b5d12ddbd7 -r f901409b074b lisp/files.el
--- 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