summaryrefslogtreecommitdiff
path: root/src/process.c
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2012-08-28 10:20:08 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2012-08-28 10:20:08 +0400
commit66322887059e1f2711e07def5eff661281cee855 (patch)
treeedf1ef336402c53b08c69f2b0d92c2391a2549d5 /src/process.c
parenta3d794a153425b09a0185c660926c241d13e0f2c (diff)
downloademacs-66322887059e1f2711e07def5eff661281cee855.tar.gz
Always use set_buffer_if_live to restore original buffer at unwind.
* buffer.h (record_unwind_current_buffer): New function. * bytecode.c, dispnew.c, editfns.c, fileio.c, fns.c, insdel.c: * keyboard.c, keymap.c, minibuf.c, print.c, process.c, textprop.c: * undo.c, window.c: Adjust users. * buffer.c (set_buffer_if_live): Fix comment.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c
index 64c70c49590..fbe56ebcb54 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5196,7 +5196,7 @@ read_process_output (Lisp_Object proc, register int channel)
/* There's no good reason to let process filters change the current
buffer, and many callers of accept-process-output, sit-for, and
friends don't expect current-buffer to be changed from under them. */
- record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
+ record_unwind_current_buffer ();
/* Read and dispose of the process output. */
outstream = p->filter;
@@ -6587,7 +6587,7 @@ exec_sentinel (Lisp_Object proc, Lisp_Object reason)
/* There's no good reason to let sentinels change the current
buffer, and many callers of accept-process-output, sit-for, and
friends don't expect current-buffer to be changed from under them. */
- record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
+ record_unwind_current_buffer ();
sentinel = p->sentinel;
if (NILP (sentinel))