diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-01 03:21:06 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-01 03:21:06 +0000 |
| commit | 4c34eeeee5886d14f3e60b77fb563cb549c8896f (patch) | |
| tree | af17010f0864173dd6416585f08d686377791412 /src/process.c | |
| parent | 76acf92ebe73e35528c5966a21328305ba7b5aef (diff) | |
| parent | db6292445840e2795f35ebad62a14314fc3c7c21 (diff) | |
| download | emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.tar.gz emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.tar.bz2 emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.zip | |
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
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/process.c b/src/process.c index 663170e685e..6dc5a88944c 100644 --- a/src/process.c +++ b/src/process.c @@ -149,8 +149,7 @@ Boston, MA 02110-1301, USA. */ #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 @@ usage: (make-network-process &rest ARGS) */) /* 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 @@ syms_of_process () 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. |