* xdisp.c: Rename or move local decls to avoid shadowing.

(init_iterator, handle_fontified_prop, handle_single_display_spec):
(message_dolog, message_with_string, redisplay_internal):
(redisplay_window, try_window_reusing_current_matrix, try_window_id):
(compute_line_metrics, highlight_trailing_whitespace, cursor_row_p):
(display_line, display_string, rows_from_pos_range):
(mouse_face_from_buffer_pos, note_mouse_highlight, expose_frame):
Rename or move local decls.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 34e28866144..29514f03177 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2011-03-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xdisp.c: Rename or move local decls to avoid shadowing.
+        (init_iterator, handle_fontified_prop, handle_single_display_spec):
+        (message_dolog, message_with_string, redisplay_internal):
+        (redisplay_window, try_window_reusing_current_matrix, try_window_id):
+        (compute_line_metrics, highlight_trailing_whitespace, cursor_row_p):
+        (display_line, display_string, rows_from_pos_range):
+        (mouse_face_from_buffer_pos, note_mouse_highlight, expose_frame):
+        Rename or move local decls.
+
 2011-03-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Work around some portability problems with symlinks.