diff options
| author | Andreas Schwab | 2012-12-04 22:18:37 +0100 |
|---|---|---|
| committer | Andreas Schwab | 2012-12-04 22:18:37 +0100 |
| commit | 396376f1aeb072d20f1a8271ee47620b2ba9c15b (patch) | |
| tree | 271f4f500d598629548d3aa34bac10b4829c1954 /src | |
| parent | 115574213892efc2f9872db263b854a18cc5c8ae (diff) | |
| download | emacs-396376f1aeb072d20f1a8271ee47620b2ba9c15b.tar.gz emacs-396376f1aeb072d20f1a8271ee47620b2ba9c15b.zip | |
* callproc.c (Fcall_process): Fix specpdl nesting for asynchronous
processes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/callproc.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 37c8647d65f..ef67df9d792 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-04 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * callproc.c (Fcall_process): Fix specpdl nesting for asynchronous | ||
| 4 | processes. | ||
| 5 | |||
| 1 | 2012-12-04 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2012-12-04 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | * lisp.h (Mouse_HLInfo): Remove set-but-unused mouse_face_image_state | 8 | * lisp.h (Mouse_HLInfo): Remove set-but-unused mouse_face_image_state |
diff --git a/src/callproc.c b/src/callproc.c index 21c52d09e6b..2cc395428f8 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -685,7 +685,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 685 | { | 685 | { |
| 686 | if (fd0 >= 0) | 686 | if (fd0 >= 0) |
| 687 | emacs_close (fd0); | 687 | emacs_close (fd0); |
| 688 | return Qnil; | 688 | return unbind_to (count, Qnil); |
| 689 | } | 689 | } |
| 690 | 690 | ||
| 691 | #if defined (MSDOS) | 691 | #if defined (MSDOS) |