diff options
| author | Karoly Lorentey | 2005-12-10 21:18:28 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-12-10 21:18:28 +0000 |
| commit | 16986fcfcca94e88e620c38775e15f758aa44935 (patch) | |
| tree | 1006528b714927481dc4ef9e649efa10eee17433 /src/buffer.c | |
| parent | 9ef706664e98e37e9633712126bae99869904677 (diff) | |
| parent | e67f8828f5f9c4ba3697e048c6386c5e9c0c801e (diff) | |
| download | emacs-16986fcfcca94e88e620c38775e15f758aa44935.tar.gz emacs-16986fcfcca94e88e620c38775e15f758aa44935.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-664
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-665
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-666
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-447
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index a20f6a2d683..d52a710573e 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -1359,7 +1359,8 @@ with SIGHUP. */) | |||
| 1359 | /* First run the query functions; if any query is answered no, | 1359 | /* First run the query functions; if any query is answered no, |
| 1360 | don't kill the buffer. */ | 1360 | don't kill the buffer. */ |
| 1361 | arglist[0] = Qkill_buffer_query_functions; | 1361 | arglist[0] = Qkill_buffer_query_functions; |
| 1362 | if (NILP (Frun_hook_with_args_until_failure (1, arglist))) | 1362 | tem = Frun_hook_with_args_until_failure (1, arglist); |
| 1363 | if (NILP (tem)) | ||
| 1363 | return unbind_to (count, Qnil); | 1364 | return unbind_to (count, Qnil); |
| 1364 | 1365 | ||
| 1365 | /* Then run the hooks. */ | 1366 | /* Then run the hooks. */ |