diff options
| author | Dmitry Antipov | 2013-08-13 12:17:50 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-08-13 12:17:50 +0400 |
| commit | ae966a860afc2d7ebbb1e96a68c2df3cfbdc2b81 (patch) | |
| tree | be40c43c99cf61a920baadc3562eef70e933bea0 /src | |
| parent | 55e47f950d4fcc5fd0b02a02aa8c7d622ffaa0d4 (diff) | |
| download | emacs-ae966a860afc2d7ebbb1e96a68c2df3cfbdc2b81.tar.gz emacs-ae966a860afc2d7ebbb1e96a68c2df3cfbdc2b81.zip | |
* window.c (Fset_window_start): Compare `w', not `window' because
`w' might not be equal to `window' after call to decode_live_window.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/window.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3b8dfe011ee..32b0eb209c9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * window.c (Fset_window_start): Compare `w', not `window' because | ||
| 4 | `w' might not be equal to `window' after call to decode_live_window. | ||
| 5 | |||
| 1 | 2013-08-12 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-08-12 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * process.c (deactivate_process): Reset fds to -1 (Bug#15035). | 8 | * process.c (deactivate_process): Reset fds to -1 (Bug#15035). |
diff --git a/src/window.c b/src/window.c index 47a7b58ba9b..be009d37810 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -1612,7 +1612,7 @@ overriding motion of point in order to display at this exact start. */) | |||
| 1612 | if (NILP (noforce)) | 1612 | if (NILP (noforce)) |
| 1613 | w->force_start = 1; | 1613 | w->force_start = 1; |
| 1614 | w->update_mode_line = 1; | 1614 | w->update_mode_line = 1; |
| 1615 | if (!EQ (window, selected_window)) | 1615 | if (w != XWINDOW (selected_window)) |
| 1616 | /* Enforce full redisplay. FIXME: make it more selective. */ | 1616 | /* Enforce full redisplay. FIXME: make it more selective. */ |
| 1617 | windows_or_buffers_changed++; | 1617 | windows_or_buffers_changed++; |
| 1618 | 1618 | ||