diff options
| author | Eli Zaretskii | 2011-08-15 09:44:48 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2011-08-15 09:44:48 +0300 |
| commit | 9fd8be0026fc24b1d291c5adb6cc179120b86627 (patch) | |
| tree | 140cde23ed136e6af2eb4549697274dbf004cc7e /src | |
| parent | de148fee1a02003faedf49b831abecfec15f60e7 (diff) | |
| download | emacs-9fd8be0026fc24b1d291c5adb6cc179120b86627.tar.gz emacs-9fd8be0026fc24b1d291c5adb6cc179120b86627.zip | |
Another part of fixing bug #9296 with vertical cursor motion.
src/xdisp.c (move_it_in_display_line_to): Don't reset pixel
coordinates of the iterator when restoring from ppos_it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 40a0ed24e6a..628875f7ae6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-08-15 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (move_it_in_display_line_to): Don't reset pixel | ||
| 4 | coordinates of the iterator when restoring from ppos_it. | ||
| 5 | (Bug#9296) | ||
| 6 | |||
| 1 | 2011-08-14 Kenichi Handa <handa@m17n.org> | 7 | 2011-08-14 Kenichi Handa <handa@m17n.org> |
| 2 | 8 | ||
| 3 | * process.c (create_process): Call setup_process_coding_systems | 9 | * process.c (create_process): Call setup_process_coding_systems |
diff --git a/src/xdisp.c b/src/xdisp.c index ff3f55bef25..b83d4bac743 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -8093,7 +8093,8 @@ move_it_in_display_line_to (struct it *it, | |||
| 8093 | { | 8093 | { |
| 8094 | if (!at_eob_p && IT_CHARPOS (ppos_it) < ZV) | 8094 | if (!at_eob_p && IT_CHARPOS (ppos_it) < ZV) |
| 8095 | RESTORE_IT (it, &ppos_it, ppos_data); | 8095 | RESTORE_IT (it, &ppos_it, ppos_data); |
| 8096 | goto buffer_pos_reached; | 8096 | result = MOVE_POS_MATCH_OR_ZV; |
| 8097 | break; | ||
| 8097 | } | 8098 | } |
| 8098 | if (ITERATOR_AT_END_OF_LINE_P (it)) | 8099 | if (ITERATOR_AT_END_OF_LINE_P (it)) |
| 8099 | { | 8100 | { |
| @@ -8107,7 +8108,8 @@ move_it_in_display_line_to (struct it *it, | |||
| 8107 | { | 8108 | { |
| 8108 | if (IT_CHARPOS (ppos_it) < ZV) | 8109 | if (IT_CHARPOS (ppos_it) < ZV) |
| 8109 | RESTORE_IT (it, &ppos_it, ppos_data); | 8110 | RESTORE_IT (it, &ppos_it, ppos_data); |
| 8110 | goto buffer_pos_reached; | 8111 | result = MOVE_POS_MATCH_OR_ZV; |
| 8112 | break; | ||
| 8111 | } | 8113 | } |
| 8112 | result = MOVE_LINE_TRUNCATED; | 8114 | result = MOVE_LINE_TRUNCATED; |
| 8113 | break; | 8115 | break; |