[Emacs-diffs] Changes to emacs/src/fileio.c [emacs-unicode]

[Kenichi Handa]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.439.2.7 emacs/src/fileio.c:1.439.2.8
*** emacs/src/fileio.c:1.439.2.7        Thu May 29 09:18:29 2003
--- emacs/src/fileio.c  Wed Jun 25 20:26:38 2003
***************
*** 4583,4589 ****
  
  /* Decide the coding-system to encode the data with.  */
  
! void
  choose_write_coding_system (start, end, filename,
                            append, visit, lockname, coding)
       Lisp_Object start, end, filename, append, visit, lockname;
--- 4583,4589 ----
  
  /* Decide the coding-system to encode the data with.  */
  
! static Lisp_Object
  choose_write_coding_system (start, end, filename,
                            append, visit, lockname, coding)
       Lisp_Object start, end, filename, append, visit, lockname;
***************
*** 4631,4638 ****
            val = XCDR (coding_systems);
        }
  
!       if (NILP (val)
!         && !NILP (current_buffer->buffer_file_coding_system))
        {
          /* If we still have not decided a coding system, use the
             default value of buffer-file-coding-system.  */
--- 4631,4637 ----
            val = XCDR (coding_systems);
        }
  
!       if (NILP (val))
        {
          /* If we still have not decided a coding system, use the
             default value of buffer-file-coding-system.  */
***************
*** 4658,4664 ****
        /* If the decided coding-system doesn't specify end-of-line
         format, we use that of
         `default-buffer-file-coding-system'.  */
!       if (! using_default_coding)
        val = (coding_inherit_eol_type
               (val, buffer_defaults.buffer_file_coding_system));
  
--- 4657,4664 ----
        /* If the decided coding-system doesn't specify end-of-line
         format, we use that of
         `default-buffer-file-coding-system'.  */
!       if (! using_default_coding
!         && ! NILP (buffer_defaults.buffer_file_coding_system))
        val = (coding_inherit_eol_type
               (val, buffer_defaults.buffer_file_coding_system));
  
***************
*** 4668,4677 ****
        val = raw_text_coding_system (val);
      }
  
!   setup_coding_system (Fcheck_coding_system (val), coding);
  
    if (!STRINGP (start) && !NILP (current_buffer->selective_display))
      coding->mode |= CODING_MODE_SELECTIVE_DISPLAY;
  }
  
  DEFUN ("write-region", Fwrite_region, Swrite_region, 3, 7,
--- 4668,4681 ----
        val = raw_text_coding_system (val);
      }
  
!   setup_coding_system (val, coding);
!   if (! NILP (val)
!       && VECTORP (CODING_ID_EOL_TYPE (coding->id)))
!     val = AREF (CODING_ID_EOL_TYPE (coding->id), 0);
  
    if (!STRINGP (start) && !NILP (current_buffer->selective_display))
      coding->mode |= CODING_MODE_SELECTIVE_DISPLAY;
+   return val;
  }
  
  DEFUN ("write-region", Fwrite_region, Swrite_region, 3, 7,
***************
*** 4807,4815 ****
       We used to make this choice before calling build_annotations, but that
       leads to problems when a write-annotate-function takes care of
       unsavable chars (as was the case with X-Symbol).  */
!   choose_write_coding_system (start, end, filename,
!                             append, visit, lockname, &coding);
!   Vlast_coding_system_used = CODING_ID_NAME (coding.id);
  
    given_buffer = current_buffer;
    if (current_buffer != given_buffer)
--- 4811,4819 ----
       We used to make this choice before calling build_annotations, but that
       leads to problems when a write-annotate-function takes care of
       unsavable chars (as was the case with X-Symbol).  */
!   Vlast_coding_system_used
!     = choose_write_coding_system (start, end, filename,
!                                 append, visit, lockname, &coding);
  
    given_buffer = current_buffer;
    if (current_buffer != given_buffer)