[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src process.c [EMACS_23_1_RC]
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] emacs/src process.c [EMACS_23_1_RC] |
Date: |
Sun, 28 Jun 2009 20:26:48 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_23_1_RC
Changes by: Andreas Schwab <schwab> 09/06/28 20:26:48
Modified files:
src : process.c
Log message:
Simplify last change.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/process.c?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.587.2.1&r2=1.587.2.2
Patches:
Index: process.c
===================================================================
RCS file: /sources/emacs/emacs/src/process.c,v
retrieving revision 1.587.2.1
retrieving revision 1.587.2.2
diff -u -b -r1.587.2.1 -r1.587.2.2
--- process.c 28 Jun 2009 20:14:28 -0000 1.587.2.1
+++ process.c 28 Jun 2009 20:26:48 -0000 1.587.2.2
@@ -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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src process.c [EMACS_23_1_RC],
Andreas Schwab <=