diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-03-28 06:41:05 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-03-28 06:41:05 +0400 |
| commit | 5c89ca240d7efa68b29651b34b8fbca172a5f75a (patch) | |
| tree | 4f5331a0283148733836f43b271b9b0863f10a24 /src/editfns.c | |
| parent | 115694a3d83c3c248ad068a0330eea9e1eb4ff59 (diff) | |
| download | emacs-5c89ca240d7efa68b29651b34b8fbca172a5f75a.tar.gz emacs-5c89ca240d7efa68b29651b34b8fbca172a5f75a.tar.bz2 emacs-5c89ca240d7efa68b29651b34b8fbca172a5f75a.zip | |
* xdisp.c (with_echo_area_buffer_unwind_data): Save window
start marker...
(unwind_with_echo_area_buffer): ...to restore it here. This
is needed to ensure that...
(redisplay_window): ...both window markers are valid here,
which is verified by eassert.
* editfns.c (save_excursion_save): Do not assume that
selected_window always displays the buffer.
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/editfns.c b/src/editfns.c index 2d87b8e0064..0ab7c143c99 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -846,7 +846,7 @@ save_excursion_save (void) ? Fcopy_marker (BVAR (current_buffer, mark), Qnil) : Qnil), /* Selected window if current buffer is shown in it, nil otherwise. */ - ((XBUFFER (XWINDOW (selected_window)->buffer) == current_buffer) + (EQ (XWINDOW (selected_window)->buffer, Fcurrent_buffer ()) ? selected_window : Qnil), BVAR (current_buffer, mark_active)); } |