From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 31 May 2011 05:15:34 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~81^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=333d54dade1e7005d5a97612907158fe5ec3d310;p=emacs.git

Merge from trunk.
---

333d54dade1e7005d5a97612907158fe5ec3d310
diff --cc src/ChangeLog
index bada9f108f7,813e590681d..880cafc05a4
--- a/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.