Mercurial > emacs

changeset 90588:3cc17c82c7df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Finsert_file_contents): On recovering a file, assume Unix-like eol. (choose_write_coding_system): On auto-saving a file, force Unix-like eol.
author Kenichi Handa <handa@m17n.org>
date Mon, 21 Aug 2006 12:49:41 +0000
parents fe721cfad011
children 697dcc1df88d
files src/fileio.c
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/fileio.c	Mon Aug 21 12:48:22 2006 +0000
+++ b/src/fileio.c	Mon Aug 21 12:49:41 2006 +0000
@@ -3917,7 +3917,7 @@
 
   if (EQ (Vcoding_system_for_read, Qauto_save_coding))
     {
-      coding_system = Qutf_8_emacs;
+      coding_system = coding_inherit_eol_type (Qutf_8_emacs, Qunix);
       setup_coding_system (coding_system, &coding);
       /* Ensure we set Vlast_coding_system_used.  */
       set_coding_system = 1;
@@ -4806,11 +4806,15 @@
      struct coding_system *coding;
 {
   Lisp_Object val;
+  Lisp_Object eol_parent = Qnil;
 
   if (auto_saving
       && NILP (Fstring_equal (current_buffer->filename,
 			      current_buffer->auto_save_file_name)))
-    val = Qutf_8_emacs;
+    {
+      val = Qutf_8_emacs;
+      eol_parent = Qunix;
+    }
   else if (!NILP (Vcoding_system_for_write))
     {
       val = Vcoding_system_for_write;
@@ -4895,7 +4899,7 @@
 	val = raw_text_coding_system (val);
     }
 
-  val = coding_inherit_eol_type (val, Qnil);
+  val = coding_inherit_eol_type (val, eol_parent);
   setup_coding_system (val, coding);
 
   if (!STRINGP (start) && !NILP (current_buffer->selective_display))