diff options
| author | Miles Bader | 2006-12-16 01:29:26 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-12-16 01:29:26 +0000 |
| commit | 4bc5d7668ef47295810f28a14d67b4a9e12a341f (patch) | |
| tree | 2e22bd79984f0772c43e294babc07c1508ce95ce /src/process.c | |
| parent | b44bfd5e9bf3a0e853bc0d4788e4c89a01a70d6a (diff) | |
| parent | c3342e8eb3eaf4560210fd030383a940640648f2 (diff) | |
| download | emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.gz emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/process.c b/src/process.c index db7fcb8b201..663170e685e 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -6083,7 +6083,7 @@ If PROCESS is a network process, resume handling of incoming traffic. */) | |||
| 6083 | DEFUN ("signal-process", Fsignal_process, Ssignal_process, | 6083 | DEFUN ("signal-process", Fsignal_process, Ssignal_process, |
| 6084 | 2, 2, "sProcess (name or number): \nnSignal code: ", | 6084 | 2, 2, "sProcess (name or number): \nnSignal code: ", |
| 6085 | doc: /* Send PROCESS the signal with code SIGCODE. | 6085 | doc: /* Send PROCESS the signal with code SIGCODE. |
| 6086 | PROCESS may also be an integer specifying the process id of the | 6086 | PROCESS may also be a number specifying the process id of the |
| 6087 | process to signal; in this case, the process need not be a child of | 6087 | process to signal; in this case, the process need not be a child of |
| 6088 | this Emacs. | 6088 | this Emacs. |
| 6089 | SIGCODE may be an integer, or a symbol whose name is a signal name. */) | 6089 | SIGCODE may be an integer, or a symbol whose name is a signal name. */) |
| @@ -6100,7 +6100,7 @@ SIGCODE may be an integer, or a symbol whose name is a signal name. */) | |||
| 6100 | 6100 | ||
| 6101 | if (FLOATP (process)) | 6101 | if (FLOATP (process)) |
| 6102 | { | 6102 | { |
| 6103 | pid = (pid_t) XFLOAT (process); | 6103 | pid = (pid_t) XFLOAT_DATA (process); |
| 6104 | goto got_it; | 6104 | goto got_it; |
| 6105 | } | 6105 | } |
| 6106 | 6106 | ||
| @@ -6129,7 +6129,7 @@ SIGCODE may be an integer, or a symbol whose name is a signal name. */) | |||
| 6129 | got_it: | 6129 | got_it: |
| 6130 | 6130 | ||
| 6131 | #define parse_signal(NAME, VALUE) \ | 6131 | #define parse_signal(NAME, VALUE) \ |
| 6132 | else if (!strcasecmp (name, NAME)) \ | 6132 | else if (!xstricmp (name, NAME)) \ |
| 6133 | XSETINT (sigcode, VALUE) | 6133 | XSETINT (sigcode, VALUE) |
| 6134 | 6134 | ||
| 6135 | if (INTEGERP (sigcode)) | 6135 | if (INTEGERP (sigcode)) |
| @@ -6141,7 +6141,7 @@ SIGCODE may be an integer, or a symbol whose name is a signal name. */) | |||
| 6141 | CHECK_SYMBOL (sigcode); | 6141 | CHECK_SYMBOL (sigcode); |
| 6142 | name = SDATA (SYMBOL_NAME (sigcode)); | 6142 | name = SDATA (SYMBOL_NAME (sigcode)); |
| 6143 | 6143 | ||
| 6144 | if (!strncasecmp(name, "sig", 3)) | 6144 | if (!strncmp(name, "SIG", 3) || !strncmp(name, "sig", 3)) |
| 6145 | name += 3; | 6145 | name += 3; |
| 6146 | 6146 | ||
| 6147 | if (0) | 6147 | if (0) |