Mercurial > emacs
comparison src/buffer.c @ 18485:d6e8b92585e9
(Fbury_buffer): Undo previous change.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sat, 28 Jun 1997 07:56:29 +0000 |
parents | 9f5626727351 |
children | 9b000e52acb3 |
comparison
equal
deleted
inserted
replaced
18484:fade5fd2fab4 | 18485:d6e8b92585e9 |
---|---|
1556 { | 1556 { |
1557 /* Figure out what buffer we're going to bury. */ | 1557 /* Figure out what buffer we're going to bury. */ |
1558 if (NILP (buffer)) | 1558 if (NILP (buffer)) |
1559 { | 1559 { |
1560 XSETBUFFER (buffer, current_buffer); | 1560 XSETBUFFER (buffer, current_buffer); |
1561 | |
1562 /* If we're burying the current buffer, unshow it. */ | |
1563 Fswitch_to_buffer (Fother_buffer (buffer, Qnil), Qnil); | |
1561 } | 1564 } |
1562 else | 1565 else |
1563 { | 1566 { |
1564 Lisp_Object buf1; | 1567 Lisp_Object buf1; |
1565 | 1568 |
1566 buf1 = Fget_buffer (buffer); | 1569 buf1 = Fget_buffer (buffer); |
1567 if (NILP (buf1)) | 1570 if (NILP (buf1)) |
1568 nsberror (buffer); | 1571 nsberror (buffer); |
1569 buffer = buf1; | 1572 buffer = buf1; |
1570 } | 1573 } |
1571 | |
1572 /* Unshow the buffer in the selected window, if it is there. */ | |
1573 if (EQ (XWINDOW (selected_window)->buffer, buffer)) | |
1574 Fswitch_to_buffer (Fother_buffer (buffer, Qnil), Qnil); | |
1575 /* Otherwise, unshow it in other frames. */ | |
1576 else | |
1577 Freplace_buffer_in_windows (buffer); | |
1578 | 1574 |
1579 /* Move buffer to the end of the buffer list. */ | 1575 /* Move buffer to the end of the buffer list. */ |
1580 { | 1576 { |
1581 register Lisp_Object aelt, link; | 1577 register Lisp_Object aelt, link; |
1582 | 1578 |