Mercurial > vim
comparison src/move.c @ 10295:d0b74b18e4b5 v8.0.0044
commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Oct 18 14:50:18 2016 +0200
patch 8.0.0044
Problem: In diff mode the cursor may end up below the last line, resulting
in an ml_get error.
Solution: Check the line to be valid.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 18 Oct 2016 15:00:04 +0200 |
| parents | b80ad55d62d8 |
| children | cf988222b150 |
comparison
equal
deleted
inserted
replaced
| 10294:76376eb4cbe5 | 10295:d0b74b18e4b5 |
|---|---|
| 2822 /* skip original window and windows with 'noscrollbind' */ | 2822 /* skip original window and windows with 'noscrollbind' */ |
| 2823 if (curwin != old_curwin && curwin->w_p_crb) | 2823 if (curwin != old_curwin && curwin->w_p_crb) |
| 2824 { | 2824 { |
| 2825 # ifdef FEAT_DIFF | 2825 # ifdef FEAT_DIFF |
| 2826 if (curwin->w_p_diff) | 2826 if (curwin->w_p_diff) |
| 2827 curwin->w_cursor.lnum | 2827 curwin->w_cursor.lnum = |
| 2828 = diff_get_corresponding_line(old_curbuf, | 2828 diff_get_corresponding_line(old_curbuf, line); |
| 2829 line, | |
| 2830 curbuf, | |
| 2831 curwin->w_cursor.lnum); | |
| 2832 else | 2829 else |
| 2833 # endif | 2830 # endif |
| 2834 curwin->w_cursor.lnum = line; | 2831 curwin->w_cursor.lnum = line; |
| 2835 curwin->w_cursor.col = col; | 2832 curwin->w_cursor.col = col; |
| 2836 # ifdef FEAT_VIRTUALEDIT | 2833 # ifdef FEAT_VIRTUALEDIT |