diff options
| author | Joakim Verona | 2013-03-26 15:31:46 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 15:31:46 +0100 |
| commit | e11705b616777a8a72363b2037d989987630e863 (patch) | |
| tree | fda56011e9ac37da9e53762d8dc24c7a87cbee82 /src/window.c | |
| parent | c446797d60edf1058f6cbec28e57255d245dd47b (diff) | |
| parent | cded56c19b30e038537398b5213438c339428ed9 (diff) | |
| download | emacs-e11705b616777a8a72363b2037d989987630e863.tar.gz emacs-e11705b616777a8a72363b2037d989987630e863.zip | |
conflict resolve
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 ee25a668981..c987d08534e 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -5025,7 +5025,7 @@ specifies the window to scroll. This takes precedence over | |||
| 5025 | ++windows_or_buffers_changed; | 5025 | ++windows_or_buffers_changed; |
| 5026 | 5026 | ||
| 5027 | Fset_buffer (w->buffer); | 5027 | Fset_buffer (w->buffer); |
| 5028 | SET_PT (marker_position (w->pointm)); | 5028 | SET_PT_BOTH (marker_position (w->pointm), marker_byte_position (w->pointm)); |
| 5029 | 5029 | ||
| 5030 | if (NILP (arg)) | 5030 | if (NILP (arg)) |
| 5031 | window_scroll (window, 1, 1, 1); | 5031 | window_scroll (window, 1, 1, 1); |