procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(read_process_output): Even if we read data without

Browse source 
code conversion, calculate character counts.  If we insert the
data into a unibyte buffer, treat the data as unibyte.
This commit is contained in:
Kenichi Handa 1998-07-16 00:14:44 +00:00
parent 9959c16e4f
commit 8bc49fd1f3
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/process.c
View file

@ -2911,21 +2911,24 @@ read_process_output (proc, channel)
: coding->produced_char);
chars_in_decoding_buf = 1;
}
#ifdef VMS
else if (chars_allocated)
else
{
/* Although we don't have to decode the received data, we must
move it to an area which we don't have to free. */
if (! STRINGP (p->decoding_buf)
|| STRING_BYTES (XSTRING (p->decoding_buf)) < nbytes)
p->decoding_buf = make_uninit_string (nbytes);
bcopy (chars, XSTRING (p->decoding_buf)->data, nbytes);
free (chars);
chars = XSTRING (p->decoding_buf)->data;
nchars = multibyte_chars_in_text (chars, nbytes);
chars_in_decoding_buf = 1;
}
#ifdef VMS
if (chars_allocated)
{
/* Although we don't have to decode the received data, we
must move it to an area which we don't have to free. */
if (! STRINGP (p->decoding_buf)
|| STRING_BYTES (XSTRING (p->decoding_buf)) < nbytes)
p->decoding_buf = make_uninit_string (nbytes);
bcopy (chars, XSTRING (p->decoding_buf)->data, nbytes);
free (chars);
chars = XSTRING (p->decoding_buf)->data;
chars_in_decoding_buf = 1;
}
#endif
nchars = multibyte_chars_in_text (chars, nbytes);
}
Vlast_coding_system_used = coding->symbol;
@ -3054,6 +3057,9 @@ read_process_output (proc, channel)
if (! (BEGV <= PT && PT <= ZV))
Fwiden ();
if (NILP (current_buffer->enable_multibyte_characters))
nchars = nbytes;
/* Insert before markers in case we are inserting where
the buffer's mark is, and the user's next command is Meta-y. */
if (chars_in_decoding_buf)