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

Merge from trunk.
---

90856fe0b82ba19d1c3d73a4ba48007380201e66
diff --cc ChangeLog
index ab31d008d53,879ce2834e7..731d810b7c6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,10 +1,15 @@@
- 2011-05-28  Paul Eggert  <eggert@cs.ucla.edu>
++2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Use 'inline', not 'INLINE'.
 +	* configure.in, autogen/config.in (INLINE): Remove.
 +
+ 2011-05-29  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	Adjust to recent gnulib change for @GUARD_PREFIX@.
+ 	* lib/makefile.w32-in (getopt_h): Substitute @GUARD_PREFIX@, too.
+ 	All uses of _GL_ for guard prefixes in lib/*.h replaced with
+ 	_@GUARD_PREFIX@_.
+ 
  2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>
  
  	* doc/misc/texinfo.tex, lib/getopt.c, lib/intprops.h: Merge from gnulib.
diff --cc src/ChangeLog
index f31e68e9b7b,b0b80b47689..bada9f108f7
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,13 -1,29 +1,39 @@@
- 2011-05-28  Paul Eggert  <eggert@cs.ucla.edu>
++2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Use 'inline', not 'INLINE'.
 +	* 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-29  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* image.c: Various fixes to ImageMagick code comments.
+ 	(Fimagemagick_types): Doc fix.
+ 
+ 2011-05-29  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	Minor fixes prompted by GCC 4.6.0 warnings.
+ 
+ 	* xselect.c (converted_selections, conversion_fail_tag): Now static.
+ 
+ 	* emacs.c [HAVE_X_WINDOWS]: Include "xterm.h".
+ 	(x_clipboard_manager_save_all): Move extern decl to ...
+ 	* xterm.h: ... here, so that it can be checked for consistency.
+ 
+ 2011-05-29  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* xselect.c (x_clipboard_manager_save_frame)
+ 	(x_clipboard_manager_save_all): New functions.
+ 	(Fx_clipboard_manager_save): Lisp function deleted.
+ 
+ 	* emacs.c (Fkill_emacs): Call x_clipboard_manager_save_all.
+ 	* frame.c (delete_frame): Call x_clipboard_manager_save_frame.
+ 
+ 	* xterm.h: Update prototype.
+ 
  2011-05-28  William Xu  <william.xwl@gmail.com>
  
  	* nsterm.m (ns_term_shutdown): Synchronize user defaults before