Merge from trunk.

diff --cc ChangeLog
index a21cf9d,5b5772f..de89768
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,35 -1,8 +1,40 @@@
- 2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
++2011-07-29  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Merge from gnulib, using build-aux to remove clutter (Bug#9169).
 +      * m4/largefile.m4: New file, so that Emacs does not mess up when
 +      accessing files with large inode numbers in MacOS X 10.5 and later.
 +      * m4/nocrash.m4: New file, to avoid triggering background debugger
 +      and/or create core dumps during 'configure'.
 +      * build-aux/move-if-change: Renamed from move-if-change.
 +      * build-aux/snippet/arg-nonnull.h: Renamed from arg-nonnull.h.
 +      * build-aux/snippet/c++defs.h: Renamed from c++defs.h.
 +      * build-aux/snippet/warn-on-use.h: Renamed from warn-on-use.h.
 +      * build-aux/snippet/_Noreturn.h: New file, for draft C1X _Noreturn.
 +      * .bzrignore: The autogenerated files compile, config.guess,
 +      config.sub, depcomp, install-sh, and missing are now in build-aux.
 +      * Makefile.in (epaths-force, sync-from-gnulib):
 +      move-if-change is now in build-aux.
 +      (GNULIB_TOOL_FLAGS): Avoid threadlib; this is now a prerequisite
 +      of gnulib's pthread_sigmask module, but Emacs doesn't need it.
 +      (mkdir): install-sh is now in build-aux.
 +      * config.bat: c++defs.h is now in build-aux/snippets.
 +      * configure.in: Specify AC_CONFIG_AUX_DIR with build-aux (the
 +      usual parameter).
 +      * lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
 +      * lib/makefile.w32-in (ARG_NONNULL_H): arg-nonnull.h moved
 +      to build-aux/snippet.
 +      * lib/pthread_sigmask.c, lib/stdlib.in.h, m4/extensions.m4:
 +      * m4/getopt.m4, m4/gnulib-common.m4, m4/pthread_sigmask.m4:
 +      Merge from gnuilib.  This fixes porting bugs on Cygwin, Irix, and
 +      Solaris, enables MacOS extensions, and enables nocrash during
 +      'configure'.
 +      * make-dist: Adjust to new build-aux and build-aux/snippit dirs.
 +
+ 2011-07-28  Alp Aker  <alp.tekin.aker@gmail.com>
+ 
+       * configure.in (HAVE_RSVG): Allow use of -lrsvg-2 for any NextStep
+       build, not just GNUstep (Bug#9177).
+ 
  2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
  
        Assume freestanding C89 headers, string.h, stdlib.h.

diff --cc configure.in
Simple merge

diff --cc src/ChangeLog
index d618b30,6039a54..9e8aedf
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,9 -1,61 +1,65 @@@
- 2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+ 2011-07-29  Paul Eggert  <eggert@cs.ucla.edu>
  
 +      * Makefile.in (gl-stamp): move-if-change now in build-aux (Bug#9169).
 +
 +2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
 +
+       * image.c (check_image_size): Use 1024x1024 if unknown frame (Bug#9189).
+       This is needed if max-image-size is a floating-point number.
+ 
+ 2011-07-28  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * print.c (print_object): Print empty symbol as ##.
+ 
+       * lread.c (read1): Read ## as empty symbol.
+ 
+ 2011-07-28  Alp Aker  <alp.tekin.aker@gmail.com>
+ 
+       * nsfns.m (x_set_foreground_color): Set f->foreground_pixel when
+       setting frame foreground color (Bug#9175).
+       (x_set_background_color): Likewise.
+ 
+       * nsmenu.m (-setText): Size tooltip dimensions precisely to
+       contents (Bug#9176).
+       (EmacsTooltip -init): Remove bezels and add shadows to
+       tooltip windows.
+ 
+       * nsterm.m (ns_dumpglyphs_stretch): Avoid overwriting left fringe
+       or scroll bar (Bug#8470).
+ 
+       * nsfont.m (nsfont_open): Remove assignment to voffset and
+       unnecessary vars hshink, expand, hd, full_height, min_height.
+       (nsfont_draw): Use s->ybase as baseline for glyph drawing (Bug#8913).
+ 
+       * nsterm.h (nsfont_info): Remove voffset field.
+ 
+ 2011-07-28  Alp Aker  <alp.tekin.aker@gmail.com>
+ 
+       Implement strike-through and overline on NextStep (Bug#8863).
+ 
+       * nsfont.m (nsfont_open): Use underline position provided by font,
+       instead of hard-coded value of 2.
+       (nsfont_draw): Call ns_draw_text_decoration instead.
+ 
+       * nsterm.h: Add declaration for ns_draw_text_decoration.
+ 
+       * nsterm.m (ns_draw_text_decoration): New function for drawing
+       underline, overline, and strike-through.
+       (ns_dumpglyphs_image, ns_dumpglyphs_stretch): Add call to
+       ns_draw_text_decoration.  Change treatment of cursor drawing to
+       accomodate underlining, etc.
+ 
+ 2011-07-28  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * buffer.c (init_buffer_once): Set bidi-display-reordering to t by
+       default.
+ 
+ 2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * alloc.c (memory_full) [!SYNC_INPUT]: Fix signal-related race.
+       Without this fix, if a signal arrives just after memory fills up,
+       'malloc' might be invoked reentrantly.
+ 
        * image.c (x_check_image_size) [!HAVE_X_WINDOWS]: Return 1.
        In other words, assume that every image size is allowed, on non-X
        hosts.  This assumption is probably wrong, but it lets Emacs compile.