HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b960758
)
Simplify last change.
author
Andreas Schwab
<schwab@linux-m68k.org>
Sun, 28 Jun 2009 20:25:49 +0000
(20:25 +0000)
committer
Andreas Schwab
<schwab@linux-m68k.org>
Sun, 28 Jun 2009 20:25:49 +0000
(20:25 +0000)
src/process.c
patch
|
blob
|
blame
|
history
diff --git
a/src/process.c
b/src/process.c
index
38980d2
..
058e20b
100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-5550,11
+5550,10
@@
send_process (proc, buf, len, object)
struct Lisp_Process *p = XPROCESS (proc);
int rv;
struct coding_system *coding;
struct Lisp_Process *p = XPROCESS (proc);
int rv;
struct coding_system *coding;
- struct gcpro gcpro1
, gcpro2
;
+ struct gcpro gcpro1;
SIGTYPE (*volatile old_sigpipe) ();
SIGTYPE (*volatile old_sigpipe) ();
- Lisp_Object dst_object = Qnil;
- GCPRO
2 (object, dst_
object);
+ GCPRO
1 (
object);
if (p->raw_status_new)
update_status (p);
if (p->raw_status_new)
update_status (p);
@@
-5633,8
+5632,8
@@
send_process (proc, buf, len, object)
}
len = coding->produced;
}
len = coding->produced;
-
dst_
object = coding->dst_object;
- buf = SDATA (
dst_
object);
+ object = coding->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)
/* Running filters might relocate buffers or strings.
Arrange to relocate BUF. */
/* 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);
offset = BUF_PTR_BYTE_POS (XBUFFER (object), buf);
else if (STRINGP (object))
offset = buf - SDATA (object);
@@
-5778,9
+5775,7
@@
send_process (proc, buf, len, object)
wait_reading_process_output (1, 0, 0, 0, Qnil, NULL, 0);
#endif
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);
buf = BUF_BYTE_ADDRESS (XBUFFER (object), offset);
else if (STRINGP (object))
buf = offset + SDATA (object);