Mercurial > emacs

diff src/process.c @ 83483:8976b9f5eda1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-120 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-121 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-122 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-123 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-124 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-125 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-126 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-127 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-40 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-41 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-42 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-523
author Karoly Lorentey <lorentey@elte.hu>
date Tue, 28 Feb 2006 17:35:08 +0000
parents b98066f4aa10 08c9c1760e1c
children 0cdee8b991e1
line wrap: on
line diff
--- a/src/process.c	Sat Feb 25 01:07:18 2006 +0000
+++ b/src/process.c	Tue Feb 28 17:35:08 2006 +0000
@@ -1582,7 +1582,7 @@
 #endif
 
   /* Make the process marker point into the process buffer (if any).  */
-  if (!NILP (buffer))
+  if (BUFFERP (buffer))
     set_marker_both (XPROCESS (proc)->mark, buffer,
 		     BUF_ZV (XBUFFER (buffer)),
 		     BUF_ZV_BYTE (XBUFFER (buffer)));
@@ -3360,6 +3360,12 @@
   if (is_server && socktype == SOCK_STREAM)
     p->status = Qlisten;
 
+  /* Make the process marker point into the process buffer (if any).  */
+  if (BUFFERP (buffer))
+    set_marker_both (p->mark, buffer,
+		     BUF_ZV (XBUFFER (buffer)),
+		     BUF_ZV_BYTE (XBUFFER (buffer)));
+
 #ifdef NON_BLOCKING_CONNECT
   if (is_non_blocking_client)
     {