Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 90731:a6c97c25a666 | 90732:bc10a33dd40b |
|---|---|
| 147 #include "dispextern.h" | 147 #include "dispextern.h" |
| 148 #include "composite.h" | 148 #include "composite.h" |
| 149 #include "atimer.h" | 149 #include "atimer.h" |
| 150 | 150 |
| 151 Lisp_Object Qprocessp; | 151 Lisp_Object Qprocessp; |
| 152 Lisp_Object Qrun, Qstop; | 152 Lisp_Object Qrun, Qstop, Qsignal; |
| 153 extern Lisp_Object Qsignal; | |
| 154 Lisp_Object Qopen, Qclosed, Qconnect, Qfailed, Qlisten; | 153 Lisp_Object Qopen, Qclosed, Qconnect, Qfailed, Qlisten; |
| 155 Lisp_Object Qlocal, Qipv4, Qdatagram; | 154 Lisp_Object Qlocal, Qipv4, Qdatagram; |
| 156 #ifdef AF_INET6 | 155 #ifdef AF_INET6 |
| 157 Lisp_Object Qipv6; | 156 Lisp_Object Qipv6; |
| 158 #endif | 157 #endif |
| 2898 } | 2897 } |
| 2899 | 2898 |
| 2900 /* Make QCaddress an alias for :local (server) or :remote (client). */ | 2899 /* Make QCaddress an alias for :local (server) or :remote (client). */ |
| 2901 QCaddress = is_server ? QClocal : QCremote; | 2900 QCaddress = is_server ? QClocal : QCremote; |
| 2902 | 2901 |
| 2903 /* :wait BOOL */ | 2902 /* :nowait BOOL */ |
| 2904 if (!is_server && socktype == SOCK_STREAM | 2903 if (!is_server && socktype == SOCK_STREAM |
| 2905 && (tem = Fplist_get (contact, QCnowait), !NILP (tem))) | 2904 && (tem = Fplist_get (contact, QCnowait), !NILP (tem))) |
| 2906 { | 2905 { |
| 2907 #ifndef NON_BLOCKING_CONNECT | 2906 #ifndef NON_BLOCKING_CONNECT |
| 2908 error ("Non-blocking connect not supported"); | 2907 error ("Non-blocking connect not supported"); |
| 6984 staticpro (&Qprocessp); | 6983 staticpro (&Qprocessp); |
| 6985 Qrun = intern ("run"); | 6984 Qrun = intern ("run"); |
| 6986 staticpro (&Qrun); | 6985 staticpro (&Qrun); |
| 6987 Qstop = intern ("stop"); | 6986 Qstop = intern ("stop"); |
| 6988 staticpro (&Qstop); | 6987 staticpro (&Qstop); |
| 6988 Qsignal = intern ("signal"); | |
| 6989 staticpro (&Qsignal); | |
| 6989 | 6990 |
| 6990 /* Qexit is already staticpro'd by syms_of_eval; don't staticpro it | 6991 /* Qexit is already staticpro'd by syms_of_eval; don't staticpro it |
| 6991 here again. | 6992 here again. |
| 6992 | 6993 |
| 6993 Qexit = intern ("exit"); | 6994 Qexit = intern ("exit"); |
