1 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 536ba29cb2c..fa8022b0d4d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+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  Dan Nicolaescu  <dann@ics.uci.edu>
 
         Make it possible to run ./temacs.