[COMMIT] Pass the NOMODIFY argument to s-b-f-c-s in a few more cases

[Aidan Kehoe]

APPROVE COMMIT

NOTE: This patch has been committed.

lisp/ChangeLog addition:

2007-06-22  Aidan Kehoe  <kehoea at 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.


XEmacs Trunk source patch:
Diff command:   cvs -q diff -Nu
Files affected: lisp/files.el
===================================================================
RCS

Index: lisp/files.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/files.el,v
retrieving revision 1.77
diff -u -u -r1.77 files.el
--- lisp/files.el	2006/11/30 07:29:36	1.77
+++ lisp/files.el	2007/06/21 22:49:14
@@ -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

-- 
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)