Merge from mainline.

diff --cc ChangeLog
index 8f439f369d7530c6d150414145a05153f6b0d8f4,f7bef44ef551a20fed84822afb504031db4a5c6b..30262b6c5bc4bfcf42eae3945806bd09f9adcfb1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,15 +1,21 @@@
+ 2011-02-26  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * .bzrignore: Ignore new lib/*.in-h files.
+ 
+       * config.bat: Rename stdint.in.h and sys_stat.in.h.  Call
+       depfiles.bat even if lib/deps already exist.
+ 
  2011-02-25  Paul Eggert  <eggert@cs.ucla.edu>
  
 +      Simplify symlink portability workaround.
 +      * m4/dos.m4: Remove.
 +      * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, lib/stat.c:
 +      * m4/gl-comp.m4, m4/stat.m4, src/config.in: Regenerate from gnulib.
 +      * lib/dosname.h: New file, regenerated from gnulib.
 +
        * configure, lib/Makefile.in, lib/getopt_int.h, lib/gnulib.mk:
-       * lib/stdlib.in.h, m4/stdlib_h.m4: Regenerate.
+       * lib/stdlib.in.h, m4/stdlib_h.m4: Regenerate to incorporate
+       recent changes to configure.in and to gnulib.
  
  2011-02-24  Glenn Morris  <rgm@gnu.org>
  

diff --cc src/ChangeLog
index a8de7268673762c019fa394aabc4a3e4511c1c61,0e5e295a622cdbc8b40a0a5c156ff49db5657417..388e8c251d1f21461d3c32a4dc2fc4405ffdb529
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,11 -1,57 +1,63 @@@
+ 2011-02-27  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * frame.c (store_frame_param): Don't store value directly in
+       buffer_list and buried_buffer_list; copy the list and remove dead
+       buffers (Bug#7898).
+ 
+ 2011-02-27  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * msdos.c (readlink) [DJGPP < 2.04]: New stub function.
+ 
+       * msdos.h: (readlink) [DJGPP < 2.04]: Declare prototype.
+ 
+       * w32.c (symlink, readlink): New stub functions.
+ 
+ 2011-02-27  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * scroll.c (CHECK_BOUNDS): #define only if GLYPH_DEBUG.
+       This avoids a gcc warning in some configurations.
+ 
+       * frame.c (x_set_screen_gamma): Rename local to avoid shadowing.
+ 
+       * frame.h: Avoid gcc -Wmissing-prototypes diagnostics.
+       (set_menu_bar_lines, x_get_resource_string): New decls.
+       * msdos.c (set_menu_bar_lines): Omit decl.
+ 
+       * dispextern.h (struct glyph): Make u.img_id int, not unsigned.
+       It's always given int values and used as an int.  This suppresses
+       a gcc "comparison of unsigned expression >= 0" warning in some
+       configurations.
+ 
+       * dispnew.c: Rename locals to avoid shadowing.
+       (update_text_area, scrolling_window, update_frame_1): Rename locals.
+ 
+ 2011-02-26  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * dispnew.c: Fix problems uncovered by gcc -Wstrict-prototypes.
+       (copy_glyph_row_contents): Remove; not used.
+       (frame_row_to_window, check_current_matrix_flags):
+       (window_change_signal): Now static, since they're not used elsewhere.
+       (check_current_matrix_flags): Surround with "#if 0", since its
+       only use is in a comment.  Maybe both the comment and the "#if 0"
+       stuff should be removed?
+ 
+       * dispnew.c: Fix problem uncovered by gcc -Wunused-variable.
+       (adjust_frame_glyphs_for_window_redisplay): Make 'w' local to the
+       contexts that actually need it.
+ 
+ 2011-02-26  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * s/msdos.h (HAVE_LSTAT): Define for DJGPP >= 2.04.
+       (lstat): Define for DJGPP < 2.04.
+ 
  2011-02-25  Paul Eggert  <eggert@cs.ucla.edu>
  
 +      Simplify symlink portability workaround.
 +      * fileio.c (Fmake_symbolic_link): Treat ENOSYS specially, and
 +      generate a special message for it.  Suggested by Eli Zaretskii in
 +      <http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00995.html>.
 +      * config.in: Regenerate.
 +
        * dired.c (Ffile_attributes): Increase size of modes from 10 to 12
        as per recent filemodestring API change.  Reported by Jonas Öster in
        <http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg01069.html>.