Mercurial > emacs
changeset 103621:444861df76cd
Simplify last change.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Sun, 28 Jun 2009 20:25:49 +0000 |
| parents | 70e98b9afe06 |
| children | f16f1c3154df |
| files | src/process.c |
| diffstat | 1 files changed, 7 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/process.c Sun Jun 28 20:12:20 2009 +0000 +++ b/src/process.c Sun Jun 28 20:25:49 2009 +0000 @@ -5550,11 +5550,10 @@ struct Lisp_Process *p = XPROCESS (proc); int rv; struct coding_system *coding; - struct gcpro gcpro1, gcpro2; + struct gcpro gcpro1; SIGTYPE (*volatile old_sigpipe) (); - Lisp_Object dst_object = Qnil; - - GCPRO2 (object, dst_object); + + GCPRO1 (object); if (p->raw_status_new) update_status (p); @@ -5633,8 +5632,8 @@ } len = coding->produced; - dst_object = coding->dst_object; - buf = SDATA (dst_object); + object = coding->dst_object; + buf = SDATA (object); } if (pty_max_bytes == 0) @@ -5765,9 +5764,7 @@ /* Running filters might relocate buffers or strings. Arrange to relocate BUF. */ - if (CODING_REQUIRE_ENCODING (coding)) - offset = buf - SDATA (dst_object); - else if (BUFFERP (object)) + if (BUFFERP (object)) offset = BUF_PTR_BYTE_POS (XBUFFER (object), buf); else if (STRINGP (object)) offset = buf - SDATA (object); @@ -5778,9 +5775,7 @@ wait_reading_process_output (1, 0, 0, 0, Qnil, NULL, 0); #endif - if (CODING_REQUIRE_ENCODING (coding)) - buf = offset + SDATA (dst_object); - else if (BUFFERP (object)) + if (BUFFERP (object)) buf = BUF_BYTE_ADDRESS (XBUFFER (object), offset); else if (STRINGP (object)) buf = offset + SDATA (object);