From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 25 Feb 2011 06:42:06 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~677^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a07b892ff17e95e513c4bfe6e2dd73df1e589bf3;p=emacs.git

Merge from mainline.
---

a07b892ff17e95e513c4bfe6e2dd73df1e589bf3
diff --cc ChangeLog
index dfde83ba24e,b57b3236023..67a29aa7e12
--- a/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 src/ChangeLog
index 6673a25f74f,29a213a1e09..3719b61b413
--- a/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)