diff lisp/code-files.el @ 4647:e4ed58cb0e5b

Fix bugs with #'find-file, 0-length files, & coding-system-for-read specified. src/ChangeLog addition: 2009-07-11 Aidan Kehoe <kehoea@parhasard.net> * file-coding.c (undecided_canonicalize_after_coding): If no data have been seen, or if coding_stream_canonicalize_after_coding gives nil, pass back str->codesys, which will be of type undecided (the same as the old behaviour) but will reflect any CODESYS argument passed to make_coding_input_stream. See also the change in lisp/code-files.el lisp/ChangeLog addition: 2009-07-11 Aidan Kehoe <kehoea@parhasard.net> * code-files.el (insert-file-contents): Take advantage of more sensible behaviour from #'insert-file-contents-internal, allowing us to actually follow the documented coding system behaviour for nonexistent files (that is, buffer-file-coding-system reflects coding-system-for-read &c., not becoming undecided for either zero-length or nonexistent files). tests/ChangeLog addition: 2009-07-11 Aidan Kehoe <kehoea@parhasard.net> * automated/mule-tests.el: Check for Richard Zidlicky's bug of http://mid.gmane.org/20090602194123.GA5163@linux-m68k.org; also check that supplying CODESYS to #'find-file is respected both for nonexistent files and zero-length existing files.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 11 Jul 2009 16:33:35 +0100
parents a90b63846dc4
children 8905163c49c5
line wrap: on
line diff
--- a/lisp/code-files.el	Wed Jul 01 16:42:11 2009 -0600
+++ b/lisp/code-files.el	Sat Jul 11 16:33:35 2009 +0100
@@ -449,7 +449,17 @@
           (unless (zerop (buffer-size))
             (warn "%s: autodetection failed: setting to default."
                   (file-name-nondirectory (buffer-file-name))))
-          (setq coding-system (default-value 'buffer-file-coding-system)))
+          (setq coding-system
+                (or
+                 ;; If this property is available, it will be a coding
+                 ;; system that we can use to write a file (as opposed to
+                 ;; the true undecided coding system, which trashes
+                 ;; non-Latin-1 on writing). It might just be the value of
+                 ;; coding-system passed to #'insert-file-contents-internal.
+                 (coding-system-property coding-system 'coding-system)
+                 ;; Otherwise, take the value normally specified by the
+                 ;; language environment:
+                 (default-value 'buffer-file-coding-system))))
 	;; call any `post-read-conversion' for the coding system that
 	;; was used ...
 	(let ((func