diff options
| author | Kenichi Handa | 2013-03-16 01:04:47 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2013-03-16 01:04:47 +0900 |
| commit | 646859d33a8ede0cbb3e1685a313420b6510c9c1 (patch) | |
| tree | c8077a7e046ac64dd9bd680b5349bfc34cd6deac /src/window.c | |
| parent | 8a44e6d176989d8eef140314098c76a70248ba61 (diff) | |
| parent | d7251c31ab74219747e3755f78ee07b37a16697d (diff) | |
| download | emacs-646859d33a8ede0cbb3e1685a313420b6510c9c1.tar.gz emacs-646859d33a8ede0cbb3e1685a313420b6510c9c1.zip | |
merge trunk
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 77696131512..940e0f7565a 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -5021,7 +5021,7 @@ specifies the window to scroll. This takes precedence over | |||
| 5021 | ++windows_or_buffers_changed; | 5021 | ++windows_or_buffers_changed; |
| 5022 | 5022 | ||
| 5023 | Fset_buffer (w->buffer); | 5023 | Fset_buffer (w->buffer); |
| 5024 | SET_PT (marker_position (w->pointm)); | 5024 | SET_PT_BOTH (marker_position (w->pointm), marker_byte_position (w->pointm)); |
| 5025 | 5025 | ||
| 5026 | if (NILP (arg)) | 5026 | if (NILP (arg)) |
| 5027 | window_scroll (window, 1, 1, 1); | 5027 | window_scroll (window, 1, 1, 1); |