Mercurial > emacs
diff src/process.c @ 90732:bc10a33dd40b
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 563-582)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 177-185)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 01 Jan 2007 03:21:06 +0000 |
| parents | 6588c6259dfb 9321ec6bc5db |
| children | 95d0cdf160ea |
line wrap: on
line diff
--- a/src/process.c Wed Dec 20 07:28:28 2006 +0000 +++ b/src/process.c Mon Jan 01 03:21:06 2007 +0000 @@ -149,8 +149,7 @@ #include "atimer.h" Lisp_Object Qprocessp; -Lisp_Object Qrun, Qstop; -extern Lisp_Object Qsignal; +Lisp_Object Qrun, Qstop, Qsignal; Lisp_Object Qopen, Qclosed, Qconnect, Qfailed, Qlisten; Lisp_Object Qlocal, Qipv4, Qdatagram; #ifdef AF_INET6 @@ -2900,7 +2899,7 @@ /* Make QCaddress an alias for :local (server) or :remote (client). */ QCaddress = is_server ? QClocal : QCremote; - /* :wait BOOL */ + /* :nowait BOOL */ if (!is_server && socktype == SOCK_STREAM && (tem = Fplist_get (contact, QCnowait), !NILP (tem))) { @@ -6986,6 +6985,8 @@ staticpro (&Qrun); Qstop = intern ("stop"); staticpro (&Qstop); + Qsignal = intern ("signal"); + staticpro (&Qsignal); /* Qexit is already staticpro'd by syms_of_eval; don't staticpro it here again.
