* callproc.c (Fcall_process): Fix specpdl nesting for asynchronous

processes.

diff --git a/src/ChangeLog b/src/ChangeLog
index 37c8647d65faeb3cc5cf78a838ca7fd3ae8ec37e..ef67df9d792b485acb549925b640dabd0df7be6b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-04  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * callproc.c (Fcall_process): Fix specpdl nesting for asynchronous
+       processes.
+
 2012-12-04  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * lisp.h (Mouse_HLInfo): Remove set-but-unused mouse_face_image_state

diff --git a/src/callproc.c b/src/callproc.c
index 21c52d09e6b1e5b5cefef3e60c908e51f50e67a3..2cc395428f82b1d443c17dc77b1472dae5793d12 100644 (file)
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -685,7 +685,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     {
       if (fd0 >= 0)
        emacs_close (fd0);
-      return Qnil;
+      return unbind_to (count, Qnil);
     }
 
 #if defined (MSDOS)