From: tomo <tomo>
Date: Thu, 22 Jul 1999 10:06:45 +0000 (+0000)
Subject: (insert-file-contents): Regard coding-system-magic-cookie if
X-Git-Tag: r21-2-18-tomo-2~1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5fec9a4a4af6c2f558ba7f1456bd4584b98bb49f;p=chise%2Fxemacs-chise.git

(insert-file-contents): Regard coding-system-magic-cookie if
`coding-system-for-read' is nil.
---

diff --git a/lisp/code-files.el b/lisp/code-files.el
index c07749a..ab5fd15 100644
--- a/lisp/code-files.el
+++ b/lisp/code-files.el
@@ -393,7 +393,7 @@ for reading.
 See also `insert-file-contents-access-hook',
 `insert-file-contents-pre-hook', `insert-file-contents-error-hook',
 and `insert-file-contents-post-hook'."
-  (let (return-val coding-system used-codesys)
+  (let (return-val coding-system cs used-codesys)
     ;; OK, first load the file.
     (condition-case err
 	(progn
@@ -422,11 +422,24 @@ and `insert-file-contents-post-hook'."
 		   "Invalid coding-system (%s), using 'undecided"
 		   coding-system)
 		  (setq coding-system 'undecided)))
-	    (setq return-val
-		  (insert-file-contents-internal filename visit beg end
-						 replace coding-system
-						 ;; store here!
-						 'used-codesys))
+	    (save-restriction
+	      (narrow-to-region (point)(point))
+	      (setq return-val
+		    (insert-file-contents-internal filename visit beg end
+						   replace coding-system
+						   ;; store here!
+						   'used-codesys))
+	      (or coding-system-for-read
+		  (null (setq cs (find-coding-system-magic-cookie)))
+		  (eq cs coding-system)
+		  (progn
+		    (delete-region (point-min)(point-max))
+		    (setq return-val
+			  (insert-file-contents-internal
+			   filename visit beg end
+			   replace cs
+			   ;; store here!
+			   'used-codesys)))))
 	    ))
       (file-error
        (run-hook-with-args 'insert-file-contents-error-hook