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

Merge from trunk.
---

aa1a7eb834c4671e3c49a97d72ca7e03f2a840a2
diff --cc src/ChangeLog
index 880cafc05a4,536ba29cb2c..fa8022b0d4d
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,14 -1,12 +1,23 @@@
 +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.
+ 
+ 	* 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.