diff options
| author | Joakim Verona | 2012-12-07 09:21:22 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-12-07 09:21:22 +0100 |
| commit | 205f607d2a505ab60395d204924b5f22a559ed43 (patch) | |
| tree | a7e4d776681d84ebed3465a7a62685d5fb7f7b04 /src/window.c | |
| parent | edcb8987b03c7f0592f0ccf9910952daec08f524 (diff) | |
| parent | 822995f8b9776a3bcd3794eb7c362bed0f21c4a1 (diff) | |
| download | emacs-205f607d2a505ab60395d204924b5f22a559ed43.tar.gz emacs-205f607d2a505ab60395d204924b5f22a559ed43.zip | |
auto upstream
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c index 4c798ad4570..0340044ca21 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -3251,8 +3251,7 @@ This function runs `window-scroll-functions' before running | |||
| 3251 | tem = w->buffer; | 3251 | tem = w->buffer; |
| 3252 | if (NILP (tem)) | 3252 | if (NILP (tem)) |
| 3253 | error ("Window is deleted"); | 3253 | error ("Window is deleted"); |
| 3254 | else if (!EQ (tem, Qt)) | 3254 | else |
| 3255 | /* w->buffer is t when the window is first being set up. */ | ||
| 3256 | { | 3255 | { |
| 3257 | if (!EQ (tem, buffer)) | 3256 | if (!EQ (tem, buffer)) |
| 3258 | { | 3257 | { |
| @@ -3915,7 +3914,6 @@ set correctly. See the code of `split-window' for how this is done. */) | |||
| 3915 | wset_next (o, new); | 3914 | wset_next (o, new); |
| 3916 | } | 3915 | } |
| 3917 | 3916 | ||
| 3918 | wset_buffer (n, Qt); | ||
| 3919 | wset_window_end_valid (n, Qnil); | 3917 | wset_window_end_valid (n, Qnil); |
| 3920 | memset (&n->last_cursor, 0, sizeof n->last_cursor); | 3918 | memset (&n->last_cursor, 0, sizeof n->last_cursor); |
| 3921 | 3919 | ||