diff options
| author | Tom Tromey | 2013-03-17 05:17:24 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-03-17 05:17:24 -0600 |
| commit | 6bd488cd8d05aa3983ca55f70ee384732d8c0085 (patch) | |
| tree | 5645fc7b882638d6c0eb3f61fd55bde1a63fc190 /src/window.c | |
| parent | 71f91792e3013b397996905224f387da5cc539a9 (diff) | |
| parent | 9c44569ea2a18099307e0571d523d8637000a153 (diff) | |
| download | emacs-6bd488cd8d05aa3983ca55f70ee384732d8c0085.tar.gz emacs-6bd488cd8d05aa3983ca55f70ee384732d8c0085.zip | |
merge from 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 4b30a9d55da..4109b752d8e 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); |