diff options
| author | Eli Zaretskii | 2011-02-18 17:11:10 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-02-18 17:11:10 +0200 |
| commit | 42af913dd467c574bb5ccb8825aab5881d9221e7 (patch) | |
| tree | e983e72f139bb2462cec90d39277e50418f17c43 /src | |
| parent | d6de49a103fd814420f0a5dd2cc9d8136f60eb44 (diff) | |
| download | emacs-42af913dd467c574bb5ccb8825aab5881d9221e7.tar.gz emacs-42af913dd467c574bb5ccb8825aab5881d9221e7.zip | |
xdisp.c (display_line): Fix the change made for bug#7939.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 767cf386ee8..72a9287513d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-02-18 Eli Zaretskii <eliz@gnu.org> | 1 | 2011-02-18 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * xdisp.c (display_line): Fix the change made for bug#7939. | ||
| 4 | |||
| 3 | * terminal.c (create_terminal): Use default-keyboard-coding-system | 5 | * terminal.c (create_terminal): Use default-keyboard-coding-system |
| 4 | and default-terminal-coding-system to initialize coding systems of | 6 | and default-terminal-coding-system to initialize coding systems of |
| 5 | the new terminal. (Bug#7840) | 7 | the new terminal. (Bug#7840) |
diff --git a/src/xdisp.c b/src/xdisp.c index 37fd9e4aaab..e144237d34e 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -17294,7 +17294,7 @@ display_line (struct it *it) | |||
| 17294 | if the first glyph is partially visible or if we hit a line end. */ | 17294 | if the first glyph is partially visible or if we hit a line end. */ |
| 17295 | if (it->current_x < it->first_visible_x) | 17295 | if (it->current_x < it->first_visible_x) |
| 17296 | { | 17296 | { |
| 17297 | SET_TEXT_POS (this_line_min_pos, ZV + 1, ZV_BYTE + 1); | 17297 | this_line_min_pos = row->start.pos; |
| 17298 | move_it_in_display_line_to (it, ZV, it->first_visible_x, | 17298 | move_it_in_display_line_to (it, ZV, it->first_visible_x, |
| 17299 | MOVE_TO_POS | MOVE_TO_X); | 17299 | MOVE_TO_POS | MOVE_TO_X); |
| 17300 | /* Record the smallest positions seen while we moved over | 17300 | /* Record the smallest positions seen while we moved over |