diff options
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/buffer.c b/src/buffer.c index d0ffe67d954..67eda3ee89e 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -387,7 +387,6 @@ followed by the rest of the buffers. */) | |||
| 387 | if (FRAMEP (frame)) | 387 | if (FRAMEP (frame)) |
| 388 | { | 388 | { |
| 389 | Lisp_Object framelist, prevlist, tail; | 389 | Lisp_Object framelist, prevlist, tail; |
| 390 | Lisp_Object args[3]; | ||
| 391 | 390 | ||
| 392 | framelist = Fcopy_sequence (XFRAME (frame)->buffer_list); | 391 | framelist = Fcopy_sequence (XFRAME (frame)->buffer_list); |
| 393 | prevlist = Fnreverse (Fcopy_sequence | 392 | prevlist = Fnreverse (Fcopy_sequence |
| @@ -408,10 +407,7 @@ followed by the rest of the buffers. */) | |||
| 408 | tail = XCDR (tail); | 407 | tail = XCDR (tail); |
| 409 | } | 408 | } |
| 410 | 409 | ||
| 411 | args[0] = framelist; | 410 | return CALLN (Fnconc, framelist, general, prevlist); |
| 412 | args[1] = general; | ||
| 413 | args[2] = prevlist; | ||
| 414 | return Fnconc (3, args); | ||
| 415 | } | 411 | } |
| 416 | else | 412 | else |
| 417 | return general; | 413 | return general; |
| @@ -1654,15 +1650,14 @@ cleaning up all windows currently displaying the buffer to be killed. */) | |||
| 1654 | /* Run hooks with the buffer to be killed the current buffer. */ | 1650 | /* Run hooks with the buffer to be killed the current buffer. */ |
| 1655 | { | 1651 | { |
| 1656 | ptrdiff_t count = SPECPDL_INDEX (); | 1652 | ptrdiff_t count = SPECPDL_INDEX (); |
| 1657 | Lisp_Object arglist[1]; | ||
| 1658 | 1653 | ||
| 1659 | record_unwind_protect (save_excursion_restore, save_excursion_save ()); | 1654 | record_unwind_protect (save_excursion_restore, save_excursion_save ()); |
| 1660 | set_buffer_internal (b); | 1655 | set_buffer_internal (b); |
| 1661 | 1656 | ||
| 1662 | /* First run the query functions; if any query is answered no, | 1657 | /* First run the query functions; if any query is answered no, |
| 1663 | don't kill the buffer. */ | 1658 | don't kill the buffer. */ |
| 1664 | arglist[0] = Qkill_buffer_query_functions; | 1659 | tem = CALLN (Frun_hook_with_args_until_failure, |
| 1665 | tem = Frun_hook_with_args_until_failure (1, arglist); | 1660 | Qkill_buffer_query_functions); |
| 1666 | if (NILP (tem)) | 1661 | if (NILP (tem)) |
| 1667 | return unbind_to (count, Qnil); | 1662 | return unbind_to (count, Qnil); |
| 1668 | 1663 | ||