Merge from mainline.

diff --cc src/ChangeLog
index add827a9dc4c23014a10ce66f542d44838fa7a15,d7131096995e23c8a661b0ba969cc5c38df3d801..90722187e6c54474ced6725fee07a0cfa5acf87f
--- 1/src/ChangeLog
--- 2/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.

diff --cc src/xdisp.c
Simple merge