Merge from mainline.

diff --cc src/ChangeLog
index 29514f03177830db3218dcac768a2c3f411829c4,2fc1650f7144c8c2395f752ff334f26920d28b6f..920355b172305f7277d0b2ce6fade9029b5e4845
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,14 -1,15 +1,26 @@@
 +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-06  Michael Shields  <shields@msrl.com>  (tiny change)
+ 
+       * window.c (Fnext_window): Doc fix.  (Bug#5567)
+ 
+ 2011-03-05  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.
+ 
+ 2011-03-02  Ken Brown  <kbrown@cornell.edu>
+ 
+       * sheap.c (STATIC_HEAP_SIZE): Increase to 13MB.
+ 
  2011-03-02  Paul Eggert  <eggert@cs.ucla.edu>
  
        Work around some portability problems with symlinks.