Merge from trunk.

diff --cc src/ChangeLog
index bada9f108f79b1a4ec3b9f731bd4b4bd92fb8727,813e590681d9c1edcff089f16bd1993f0d4bca1d..880cafc05a4cfd5f5a53807bf59f91b36ba622e2
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,13 -1,26 +1,37 @@@
- 2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
++2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      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  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>
+ 
+       * alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests.
+ 
+       * eval.c (Qdebug): Now static.
+       * lisp.h (Qdebug): Remove decl.  This reverts a part of the
+       2011-04-26T11:26:05Z!dan.colascione@gmail.com that inadvertently undid part of
+       2011-04-14T06:48:41Z!eggert@cs.ucla.edu.
+ 
  2011-05-29  Chong Yidong  <cyd@stupidchicken.com>
  
        * image.c: Various fixes to ImageMagick code comments.

diff --cc src/alloc.c
Simple merge

diff --cc src/lisp.h
Simple merge