From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 6 Mar 2011 07:53:03 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~674
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58635e4de85621d4f16befe15b1df44a637bd078;p=emacs.git

Merge from mainline.
---

58635e4de85621d4f16befe15b1df44a637bd078
diff --cc src/ChangeLog
index 29514f03177,2fc1650f714..920355b1723
--- a/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.