Merge from mainline.

diff --cc ChangeLog
index dfde83ba24e81575383313bfb29d420ed29989ad,b57b3236023035e0d67bdefc27be4f540d0674f7..67a29aa7e12cc77297f553cde4b3ea9aafbeab9a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,8 +1,19 @@@
+ 2011-02-24  Glenn Morris  <rgm@gnu.org>
+ 
+       * configure.in: Replace obsolete AC_OUTPUT() with AC_CONFIG_FILES(),
+       AC_CONFIG_COMMANDS(), and AC_OUTPUT sans arguments.
+ 
 +2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Work around some portability problems with symlinks.
 +      * Makefile.in (GNULIB_MODULES): Add lstat, readlink, symlink.
 +      * configure.in (lstat, HAVE_LSTAT): Remove special hack.
 +      * lib/lstat.c, lib/readlink.c, lib/stat.c, lib/symlink.c:
 +      * m4/dos.m4, m4/lstat.m4, m4/readlink.m4, m4/stat.m4, m4/symlink.m4:
 +      New files, automatically generated from gnulib.
 +      * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk:
 +      * lib/stdlib.in.h, m4/gl-comp.m4, m4/stdlib_h.m4: Regenerate.
 +
  2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
  
        Assume S_ISLNK etc. work, since gnulib supports this.

diff --cc configure.in
Simple merge

diff --cc src/ChangeLog
index 6673a25f74fb955f58d67bdea1947959c659315d,29a213a1e0996fa9c0a668d12a6aa9a3cd1bc687..3719b61b41394426f27bfa61d664d0e6e49c8598
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,12 -1,31 +1,38 @@@
+ 2011-02-25  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * 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>.
+ 
+ 2011-02-23  Ben Key  <bkey76@gmail.com>  (tiny change)
+ 
+       * nsterm.m (ns_draw_window_cursor): Obey the cursor_width argument
+       directly, for bar cursors.
+ 
+ 2011-02-23  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * xdisp.c (set_frame_cursor_types): Don't write an undefined value
+       into the frame's cursor_width.
+ 
+ 2011-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * print.c (print_object): Never print old-style backquotes.
+       Obey escapeflag for hash tables as well.
+ 
+ 2011-02-23  Kenichi Handa  <handa@m17n.org>
+ 
+       * font.c (font_open_entity): Be sure to set scaled_pixel_size.
+       (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is integer.
+ 
  2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
  
 +      Work around some portability problems with symlinks.
 +      * fileio.c (Frename_file, Fmake_symbolic_link, Ffile_symlink_p):
 +      Simplify the code by assuming that the readlink and symlink calls
 +      exist, even if they always fail on this host.
 +      (Ffile_readable_p): Likewise, for fifos.
 +      * config.in: Regenerate.
 +
        * dired.c (Ffile_attributes): Simplify and avoid #ifdef.
  
  2011-02-22  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)