2 files changed, 7 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 926297b6dd3..67035773977 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * emacsclient.c (handle_sigcont, handle_sigtstp): Use raise (sig)
+        rather than kill (getpid (), sig), as it's simpler and safer.
+
 2012-11-17  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in (SYSWAIT_H): New macro.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 8d60d7961da..78079b5cf69 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1138,7 +1138,7 @@ handle_sigcont (int signalnum)
   else
     {
       /* We are in the background; cancel the continue. */
-      kill (getpid (), SIGSTOP);
+      raise (SIGSTOP);
     }
 
   signal (signalnum, handle_sigcont);
@@ -1165,7 +1165,7 @@ handle_sigtstp (int signalnum)
   sigprocmask (SIG_BLOCK, NULL, &set);
   sigdelset (&set, signalnum);
   signal (signalnum, SIG_DFL);
-  kill (getpid (), signalnum);
+  raise (signalnum);
   sigprocmask (SIG_SETMASK, &set, NULL); /* Let's the above signal through. */
   signal (signalnum, handle_sigtstp);