diff options
| author | Dmitry Antipov | 2013-03-13 19:41:54 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-03-13 19:41:54 +0400 |
| commit | ffcd945ec5f57bcea1c7ebc6329981577baaae80 (patch) | |
| tree | 5c024a55af149a6ca5ee31a4c06130b21b056eba /src | |
| parent | 8a7debc14cad081ac726fe2e812ce25d8122327f (diff) | |
| download | emacs-ffcd945ec5f57bcea1c7ebc6329981577baaae80.tar.gz emacs-ffcd945ec5f57bcea1c7ebc6329981577baaae80.zip | |
* window.c (Fscroll_other_window): Use SET_PT_BOTH because both
character and byte positions can be obtained from marker.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/window.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e23f0167339..6c575946b25 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | * xdisp.c (init_iterator): Simplify because both character and byte | 3 | * xdisp.c (init_iterator): Simplify because both character and byte |
| 4 | positions are either specified or -1. Add eassert. Adjust comment. | 4 | positions are either specified or -1. Add eassert. Adjust comment. |
| 5 | * window.c (Fscroll_other_window): Use SET_PT_BOTH because both | ||
| 6 | character and byte positions can be obtained from marker. | ||
| 5 | 7 | ||
| 6 | 2013-03-13 Paul Eggert <eggert@cs.ucla.edu> | 8 | 2013-03-13 Paul Eggert <eggert@cs.ucla.edu> |
| 7 | 9 | ||
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); |