diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 05fccace771..ae35ff6cce2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-02-21 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Pacify GCC when configuring with --enable-gcc-warnings. | ||
| 4 | * xdisp.c (move_it_in_display_line_to) [lint]: | ||
| 5 | Initialize recently-added local. | ||
| 6 | |||
| 1 | 2014-02-21 Daniel Colascione <dancol@dancol.org> | 7 | 2014-02-21 Daniel Colascione <dancol@dancol.org> |
| 2 | 8 | ||
| 3 | * dbusbind.c: Rename dbus-init-bus to dbus-init-bus-1. | 9 | * dbusbind.c: Rename dbus-init-bus to dbus-init-bus-1. |
diff --git a/src/xdisp.c b/src/xdisp.c index 840ff1288e5..c35a64d0774 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -8313,7 +8313,7 @@ move_it_in_display_line_to (struct it *it, | |||
| 8313 | void *ppos_data = NULL; | 8313 | void *ppos_data = NULL; |
| 8314 | int may_wrap = 0; | 8314 | int may_wrap = 0; |
| 8315 | enum it_method prev_method = it->method; | 8315 | enum it_method prev_method = it->method; |
| 8316 | ptrdiff_t closest_pos, prev_pos = IT_CHARPOS (*it); | 8316 | ptrdiff_t closest_pos IF_LINT (= 0), prev_pos = IT_CHARPOS (*it); |
| 8317 | int saw_smaller_pos = prev_pos < to_charpos; | 8317 | int saw_smaller_pos = prev_pos < to_charpos; |
| 8318 | 8318 | ||
| 8319 | /* Don't produce glyphs in produce_glyphs. */ | 8319 | /* Don't produce glyphs in produce_glyphs. */ |