Merge from trunk.

diff --cc ChangeLog
index f64a271f77c1e82f4d7f779798a5a8b89562f264,f72f530b480a3768bef35934dbfbedab4178cb62..15d60a55706e24a5f4a231c95616fef51b4adbfe
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,8 +1,15 @@@
  2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
  
 +      Malloc failure behavior now depends on size of allocation.
 +      * lib/allocator.h (struct allocator.die): New size arg.
 +      * lib/careadlinkat.c (careadlinkat): Pass size to 'die' function.
 +      If the actual problem is an ssize_t limitation, not a size_t or
 +      malloc failure, fail with errno == ENAMETOOLONG instead of calling
 +      'die'.  (Bug#8762)
 +
+       Use 'inline', not 'INLINE'.
+       * configure.in (INLINE): Remove.
+ 
  2011-05-29  Paul Eggert  <eggert@cs.ucla.edu>
  
        Adjust to recent gnulib change for @GUARD_PREFIX@.

diff --cc src/ChangeLog
index fda9e44042260f543d229c1250dac49134a13e50,fa8022b0d4d2c449b0a1ae87d8b4d38fb9d5d016..90344adbe273e85464ec4098ee284f0bb9b9c242
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,21 -1,37 +1,55 @@@
- 2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
+ 2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>
  
 +      Malloc failure behavior now depends on size of allocation.
 +      * alloc.c (buffer_memory_full, memory_full): New arg NBYTES.
 +      * lisp.h: Change signatures accordingly.
 +      * alloc.c, buffer.c, editfns.c, menu.c, minibuf.c, xterm.c:
 +      All callers changed.  (Bug#8762)
 +
+       Use 'inline', not 'INLINE'.
+       <http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00914.html>
+       * alloc.c, fontset.c (INLINE): Remove.
+       * alloc.c, bidi.c, charset.c, coding.c, dispnew.c, fns.c, image.c:
+       * intervals.c, keyboard.c, process.c, syntax.c, textprop.c, w32term.c:
+       * xdisp.c, xfaces.c, xterm.c: Replace all uses of INLINE with inline.
+       * gmalloc.c (register_heapinfo): Use inline unconditionally.
+       * lisp.h (LISP_MAKE_RVALUE): Use inline, not __inline__.
+ 
+ 2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>
+ 
+       Make it possible to run ./temacs.
+ 
+       * callproc.c (set_initial_environment): Remove CANNOT_DUMP code,
+       syms_of_callproc does the same thing.  Remove test for
+       "initialized", do it in the caller.
+       * emacs.c (main): Avoid calling set_initial_environment when dumping.
+ 
+ 2011-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * minibuf.c (Finternal_complete_buffer): Return `category' metadata.
+       (read_minibuf): Use get_minibuffer.
+       (syms_of_minibuf): Use DEFSYM.
+       (Qmetadata): New var.
+       * data.c (Qbuffer): Don't make it static.
+       (syms_of_data): Use DEFSYM.
+ 
+ 2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * ccl.c (CCL_CODE_RANGE): Allow negative numbers.  (Bug#8751)
+       (CCL_CODE_MIN): New macro.
+ 
++2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
++
 +      * gnutls.c: Use Emacs's memory allocators.
 +      Without this change, the gnutls library would invoke malloc etc.
 +      directly, which causes problems on non-SYNC_INPUT hosts, and which
 +      runs afoul of improving memory_full behavior.  (Bug#8761)
 +      (fn_gnutls_global_set_mem_functions): New macro or function pointer.
 +      (emacs_gnutls_global_init): Use it to specify xmalloc, xrealloc,
 +      xfree instead of the default malloc, realloc, free.
 +      (Fgnutls_boot): No need to check for memory allocation failure,
 +      since xmalloc does that for us.
 +
  2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
  
        * alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests.

diff --cc src/alloc.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/xterm.c
Simple merge