diff options
| author | Martin Rudalics | 2008-11-14 13:53:21 +0000 |
|---|---|---|
| committer | Martin Rudalics | 2008-11-14 13:53:21 +0000 |
| commit | 1c33c906e07585984d5ae684a92f0991b0605cb2 (patch) | |
| tree | 407a57a16518814966594ca8704ff4883394ce77 /src | |
| parent | 8fc29035f39226e4c9154132fa57d57559ee4c22 (diff) | |
| download | emacs-1c33c906e07585984d5ae684a92f0991b0605cb2.tar.gz emacs-1c33c906e07585984d5ae684a92f0991b0605cb2.zip | |
(window_loop): In DELETE_BUFFER_WINDOWS case, reset
dedicated status of window before attempting to display another
buffer in it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/window.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ef38bbf5537..f25d701d8e5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-11-14 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * window.c (window_loop): In DELETE_BUFFER_WINDOWS case, reset | ||
| 4 | dedicated status of window before attempting to display another | ||
| 5 | buffer in it. | ||
| 6 | |||
| 1 | 2008-11-14 Juanma Barranquero <lekktu@gmail.com> | 7 | 2008-11-14 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 8 | ||
| 3 | * msdos.c (Fmsdos_long_file_names): | 9 | * msdos.c (Fmsdos_long_file_names): |
diff --git a/src/window.c b/src/window.c index 9f71a17c696..d770822c28d 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -2278,6 +2278,8 @@ window_loop (type, obj, mini, frames) | |||
| 2278 | display there. */ | 2278 | display there. */ |
| 2279 | Lisp_Object buffer; | 2279 | Lisp_Object buffer; |
| 2280 | buffer = Fother_buffer (obj, Qnil, w->frame); | 2280 | buffer = Fother_buffer (obj, Qnil, w->frame); |
| 2281 | /* Reset dedicated state of window. */ | ||
| 2282 | w->dedicated = Qnil; | ||
| 2281 | Fset_window_buffer (window, buffer, Qnil); | 2283 | Fset_window_buffer (window, buffer, Qnil); |
| 2282 | if (EQ (window, selected_window)) | 2284 | if (EQ (window, selected_window)) |
| 2283 | Fset_buffer (w->buffer); | 2285 | Fset_buffer (w->buffer); |