Merge from mainline.

diff --cc src/ChangeLog
index 8f3c405,ae0ae7f..9267a96
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,38 -1,33 +1,66 @@@
  2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
  
 +      Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350.
 +      * lisp.h (FLOAT_TO_STRING_BUFSIZE): New macro.
 +      * data.c (Fnumber_to_string): Use it.
 +      * print.c (float_to_string, print_object): Likewise.
 +
 +      Include <unistd.h> unilaterally.
 +      * alloc.c, atimer.c, buffer.c, callproc.c, dired.c, dispnew.c, doc.c:
 +      * doprnt.c, editfns.c, emacs.c, fileio.c, filelock.c, fns.c:
 +      * getloadavg.c, getpagesize.h, gmalloc.c, image.c, keyboard.c:
 +      * lread.c, process.c, process.h, ralloc.c, regex.c, sysdep.c:
 +      * systty.h, term.c, termcap.c, xfns.c, xrdb.c, xselect.c, xsmfns.c:
 +      * xterm.c:
 +      Include <unistd.h> without worrying about HAVE_UNISTD_H, since
 +      unistd.h is always present now, possibly supplied by gnulib.
 +
 +      * mktime.c: Remove; moving to ../lib.
 +
 +      Use gnulib's mktime module.
 +      * deps.mk (mktime.o): Remove rule.
 +
 +      Use gnulib's ftoastr module.
 +      * print.c: Include ftoastr.h.
 +      (FLT_RADIX, DBL_MANT_DIG, DBL_DIG, DBL_MIN, DOUBLE_DIGITS_BOUND):
 +      Remove; no longer needed.
 +      (float_to_string): Use dtoastr rather than rolling our own code,
 +      which had an off-by-one bug on non-IEEE hosts.
 +
 +      Automate syncing from gnulib.
 +      * Makefile.in (lib): New macro.
 +      (ALL_CFLAGS): Add -I$(lib) -I$(srcdir)/../lib.
 +      ($(lib)/libgnu.a): New rule.
 +      (temacs$(EXEEXT)): Also link $(lib)/libgnu.a.
 +
+       * xfns.c (x_real_positions): Fix signedness of local var 'ign'.
+       XGetGeometry wants unsigned int *, not int *, for its last 4 args,
+       so change the type of 'ign' to unsigned int from int.
+ 
+       * regex.c (analyse_first): Remove unreachable 'continue' statement.
+ 
+       * xterm.h (struct x_display_info): Remove stray semicolon.
+       The extra semicolon didn't conform to the C standard.
+       Problem reported by Sun cc.
+ 
+       * lisp.h: Redo flags and XSET slightly to avoid overflow diagnostics.
+       These changes make compilation easier to follow with Sun cc.
+       (ARRAY_MARK_FLAG): Make it signed, so that it can be assigned to
+       EMACS_INT values without provoking overflow diagnostics.
+       (PSEUDOVECTOR_FLAG): Likewise, for consistency.
+       (XSET) [! USE_LSB_TAG]: Use unsigned left shift to avoid overflow
+       diagnostic with signed left shift.
+ 
+       * fileio.c (make_temp_name): Remove unreachable code.
+ 
+       * fontset.c (free_realized_fontset): Mark unreachable code with if (0).
+       Previously it was marked by preceding it with "return;", but
+       Sun cc complains about this.
+ 
+       * coding.c (decode_coding_emacs_mule): Remove unreachable code.
+       This is a typo left over from 2009-03-06T07:51:52Z!handa@m17n.org,
+       which fixed Bug#2370.  Caught by Sun cc.
+ 
  2011-01-15  Martin Rudalics  <rudalics@gmx.at>
  
        * window.c (inhibit_point_swap): New variable.

diff --cc src/fileio.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/regex.c
Simple merge

diff --cc src/xfns.c
Simple merge