diff options
| author | Bill Wohler | 2012-12-08 17:19:00 -0800 |
|---|---|---|
| committer | Bill Wohler | 2012-12-08 17:19:00 -0800 |
| commit | e1b489df7af8f7034f8c2ef275b786e93a39df31 (patch) | |
| tree | 2edc9307185e2c77b98fe75f6d7eb0476c58c7e3 /src/window.c | |
| parent | ce974958f93ffa2e1bd01b4dd85dcb8ec1395787 (diff) | |
| parent | c6c08d3f8fe4d2c9e588189e46d60a30ef3e8d20 (diff) | |
| download | emacs-e1b489df7af8f7034f8c2ef275b786e93a39df31.tar.gz emacs-e1b489df7af8f7034f8c2ef275b786e93a39df31.zip | |
Merge from trunk; up to 2012-12-09T01:04:43Z!rgm@gnu.org.
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 9f3474fcd53..d7c2e8b236e 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -3250,8 +3250,7 @@ This function runs `window-scroll-functions' before running | |||
| 3250 | tem = w->buffer; | 3250 | tem = w->buffer; |
| 3251 | if (NILP (tem)) | 3251 | if (NILP (tem)) |
| 3252 | error ("Window is deleted"); | 3252 | error ("Window is deleted"); |
| 3253 | else if (!EQ (tem, Qt)) | 3253 | else |
| 3254 | /* w->buffer is t when the window is first being set up. */ | ||
| 3255 | { | 3254 | { |
| 3256 | if (!EQ (tem, buffer)) | 3255 | if (!EQ (tem, buffer)) |
| 3257 | { | 3256 | { |
| @@ -3914,7 +3913,6 @@ set correctly. See the code of `split-window' for how this is done. */) | |||
| 3914 | wset_next (o, new); | 3913 | wset_next (o, new); |
| 3915 | } | 3914 | } |
| 3916 | 3915 | ||
| 3917 | wset_buffer (n, Qt); | ||
| 3918 | wset_window_end_valid (n, Qnil); | 3916 | wset_window_end_valid (n, Qnil); |
| 3919 | memset (&n->last_cursor, 0, sizeof n->last_cursor); | 3917 | memset (&n->last_cursor, 0, sizeof n->last_cursor); |
| 3920 | 3918 | ||