From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 7 Mar 2011 06:26:47 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~605^2^2~74
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07b48fa9daec2894ad549f44fb468b251896d829;p=emacs.git

Merge from mainline.
---

07b48fa9daec2894ad549f44fb468b251896d829
diff --cc src/ChangeLog
index add827a9dc4,d7131096995..90722187e6c
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,21 -1,13 +1,29 @@@
- 2011-03-06  Paul Eggert  <eggert@cs.ucla.edu>
++2011-03-07  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* xmenu.c (menu_highlight_callback): Now static.
 +	(set_frame_menubar): Remove unused local.
 +	(xmenu_show): Rename parameter to avoid shadowing.
 +
 +	* xdisp.c (produce_glyphless_glyph): Initialize lower_xoff.
 +	Add a FIXME comment, since the code still doesn't look right.
 +	(Fcurrent_bidi_paragraph_direction): Simplify slightly; this
 +	avoids a gcc -Wuninitialized diagnostic.
 +	(display_line, BUILD_COMPOSITE_GLYPH_STRING, draw_glyphs):
 +	(note_mouse_highlight): Mark variables that gcc -Wuninitialized
 +	does not deduce are never used uninitialized.
 +
- 	* lisp.h (IF_LINT): New macro, copied from ../lib-src/emacsclient.c
- 	which in turn is copied from coreutils.
++	* lisp.h (IF_LINT): New macro, copied from ../lib-src/emacsclient.c.
++
+ 2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06
+ 	change.
  
- 	current_column: Now returns EMACS_INT, fixing some iftc.
+ 2011-03-06  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	current_column: Now returns EMACS_INT, fixing some iftc
+ 	that was introduced in the 2002-06-02 change "temporarily"; see
+ 	<http://lists.gnu.org/archive/html/emacs-devel/2002-06/msg00039.html>.
  	* bytecode.c (Fbyte_code): Don't cast current_column () to int.
  	* cmds.c (internal_self_insert): Likewise.
  	* indent.c (Fcurrent_column): Likewise.