Skip to content

GitLab

Commit 347f3cd3 authored by Andreas Schwab's avatar Andreas Schwab
Browse files
Options

Simplify last change.

parent b9607587
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 11 deletions
src/process.c
View file @ 347f3cd3
...@@ -5550,11 +5550,10 @@ send_process (proc, buf, len, object) ...@@ -5550,11 +5550,10 @@ send_process (proc, buf, len, object)
struct Lisp_Process *p = XPROCESS (proc); struct Lisp_Process *p = XPROCESS (proc);
int rv; int rv;
struct coding_system *coding; struct coding_system *coding;
struct gcpro gcpro1, gcpro2; struct gcpro gcpro1;
SIGTYPE (*volatile old_sigpipe) (); SIGTYPE (*volatile old_sigpipe) ();
Lisp_Object dst_object = Qnil;
GCPRO2 (object, dst_object); GCPRO1 (object);
if (p->raw_status_new) if (p->raw_status_new)
update_status (p); update_status (p);
...@@ -5633,8 +5632,8 @@ send_process (proc, buf, len, object) ...@@ -5633,8 +5632,8 @@ send_process (proc, buf, len, object)
} }
len = coding->produced; len = coding->produced;
dst_object = coding->dst_object; object = coding->dst_object;
buf = SDATA (dst_object); buf = SDATA (object);
} }
if (pty_max_bytes == 0) if (pty_max_bytes == 0)
...@@ -5765,9 +5764,7 @@ send_process (proc, buf, len, object) ...@@ -5765,9 +5764,7 @@ send_process (proc, buf, len, object)
/* Running filters might relocate buffers or strings. /* Running filters might relocate buffers or strings.
Arrange to relocate BUF. */ Arrange to relocate BUF. */
if (CODING_REQUIRE_ENCODING (coding)) if (BUFFERP (object))
offset = buf - SDATA (dst_object);
else if (BUFFERP (object))
offset = BUF_PTR_BYTE_POS (XBUFFER (object), buf); offset = BUF_PTR_BYTE_POS (XBUFFER (object), buf);
else if (STRINGP (object)) else if (STRINGP (object))
offset = buf - SDATA (object); offset = buf - SDATA (object);
...@@ -5778,9 +5775,7 @@ send_process (proc, buf, len, object) ...@@ -5778,9 +5775,7 @@ send_process (proc, buf, len, object)
wait_reading_process_output (1, 0, 0, 0, Qnil, NULL, 0); wait_reading_process_output (1, 0, 0, 0, Qnil, NULL, 0);
#endif #endif
if (CODING_REQUIRE_ENCODING (coding)) if (BUFFERP (object))
buf = offset + SDATA (dst_object);
else if (BUFFERP (object))
buf = BUF_BYTE_ADDRESS (XBUFFER (object), offset); buf = BUF_BYTE_ADDRESS (XBUFFER (object), offset);
else if (STRINGP (object)) else if (STRINGP (object))
buf = offset + SDATA (object); buf = offset + SDATA (object);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment