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

[Kenichi Handa]

Index: emacs/src/process.c
diff -c emacs/src/process.c:1.407 emacs/src/process.c:1.408
*** emacs/src/process.c:1.407   Sat Jun 21 20:04:44 2003
--- emacs/src/process.c Wed Jul 30 21:24:27 2003
***************
*** 4571,4579 ****
        text = (STRING_MULTIBYTE (text)
                ? Fstring_as_unibyte (text)
                : Fstring_to_multibyte (text));
!       nbytes = SBYTES (text);
!       nchars = SCHARS (text);
!       if (nbytes > 0)
        internal_condition_case_1 (read_process_output_call,
                                   Fcons (outstream,
                                          Fcons (proc, Fcons (text, Qnil))),
--- 4571,4577 ----
        text = (STRING_MULTIBYTE (text)
                ? Fstring_as_unibyte (text)
                : Fstring_to_multibyte (text));
!       if (SBYTES (text) > 0)
        internal_condition_case_1 (read_process_output_call,
                                   Fcons (outstream,
                                          Fcons (proc, Fcons (text, Qnil))),
***************
*** 4607,4613 ****
        start_vms_process_read (vs);
  #endif
        unbind_to (count, Qnil);
!       return nchars;
      }
  
    /* If no filter, write into buffer if it isn't dead.  */
--- 4605,4611 ----
        start_vms_process_read (vs);
  #endif
        unbind_to (count, Qnil);
!       return nbytes;
      }
  
    /* If no filter, write into buffer if it isn't dead.  */
***************
*** 4678,4688 ****
        text = (STRING_MULTIBYTE (text)
                ? Fstring_as_unibyte (text)
                : Fstring_to_multibyte (text));
-       nbytes = SBYTES (text);
-       nchars = SCHARS (text);
        /* Insert before markers in case we are inserting where
         the buffer's mark is, and the user's next command is Meta-y.  */
!       insert_from_string_before_markers (text, 0, 0, nchars, nbytes, 0);
  
        /* Make sure the process marker's position is valid when the
         process buffer is changed in the signal_after_change above.
--- 4676,4685 ----
        text = (STRING_MULTIBYTE (text)
                ? Fstring_as_unibyte (text)
                : Fstring_to_multibyte (text));
        /* Insert before markers in case we are inserting where
         the buffer's mark is, and the user's next command is Meta-y.  */
!       insert_from_string_before_markers (text, 0, 0,
!                                        SCHARS (text), SBYTES (text), 0);
  
        /* Make sure the process marker's position is valid when the
         process buffer is changed in the signal_after_change above.