Merge from mainline.

diff --cc lisp/ChangeLog
index 62dd255cabe718d6244c72b960c011065d205b81,402b078be7b4c6bcf1fe53551601f8fb711fb0fd..17136dddd26d2014347ec2f1852b4abf1495d119
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,14 +1,19 @@@
 +2011-04-09  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Remove the doprnt implementation, as Emacs now uses vsnprintf.
 +      * emacs-lisp/find-gc.el (find-gc-source-files): Remove doprnt.c.
 +
+ 2011-04-09  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * image-mode.el (image-toggle-display-image): Signal an error if
+       not in Image mode.
+       (image-transform-mode, image-transform-resize)
+       (image-transform-set-rotation): Doc fix.
+       (image-transform-set-resize): Deleted.
+       (image-transform-set-scale, image-transform-fit-to-height)
+       (image-transform-fit-to-width): Handle image-toggle-display-image
+       and image-transform-resize directly.
+ 
  2011-04-08  Sho Nakatani <lay.sakura@gmail.com>
  
        * doc-view.el (doc-view-fit-width-to-window)

diff --cc src/ChangeLog
index 3bd4fc1f4c0b86a6ffc004945fc28f2193051c93,a1a5abe87c33c33736eb10ccf90e73a7eb67b793..5ed6826d4295d70f15b4372f3e05b7ce74f6c0b9
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,83 -1,7 +1,87 @@@
 +2011-04-09  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * xdisp.c (vmessage): Use a better test for character truncation.
 +
 +      * charset.c (load_charset_map): <, not <=, for optimization,
 +      and to avoid potential problems with integer overflow.
 +      * chartab.c (sub_char_table_set_range, char_table_set_range): Likewise.
 +      * casetab.c (set_identity, shuffle): Likewise.
 +      * editfns.c (Fformat): Likewise.
 +      * syntax.c (skip_chars): Likewise.
 +
 +      * xmenu.c (set_frame_menubar): Allocate smaller local vectors.
 +      This also lets GCC 4.6.0 generate slightly better loop code.
 +
 +      * callint.c (Fcall_interactively): <, not <=, for optimization.
 +      (Fcall_interactively): Count the number of arguments produced,
 +      not the number of arguments given.  This is simpler and lets GCC
 +      4.6.0 generate slightly better code.
 +
 +      * ftfont.c: Distingish more carefully between FcChar8 and char.
 +      The previous code passed unsigned char * to a functions like
 +      strlen and xstrcasecmp that expect char *, which does not
 +      conform to the C standard.
 +      (get_adstyle_property, ftfont_pattern_entity): Use FcChar8 for
 +      arguments to FcPatternGetString, and explicitly cast FcChar8 * to
 +      char * when the C standard requires it.
 +
 +      * keyboard.c (read_char): Remove unused var.
 +
 +      * eval.c: Port to Windows vsnprintf (Bug#8435).
 +      Include <limits.h>.
 +      (SIZE_MAX): Define if the headers do not.
 +      (verror): Do not give up if vsnprintf returns a negative count.
 +      Instead, grow the buffer.  This ports to Windows vsnprintf, which
 +      does not conform to C99.  Problem reported by Eli Zaretskii.
 +      Also, simplify the allocation scheme, by avoiding the need for
 +      calling realloc, and removing the ALLOCATED variable.
 +
 +      * eval.c (verror): Initial buffer size is 4000 (not 200) bytes.
 +
 +      Remove the doprnt implementation, as Emacs now uses vsnprintf.
 +      * doprnt.c: Remove.
 +      * lisp.h (doprnt): Remove.
 +      * Makefile.in (base_obj): Remove doprnt.o.
 +      * deps.mk (doprnt.o): Remove.
 +
 +      error: Print 32- and 64-bit integers portably (Bug#8435).
 +      Without this change, on typical 64-bit hosts error ("...%d...", N)
 +      was used to print both 32- and 64-bit integers N, which relied on
 +      undefined behavior.
 +      * lisp.h, src/m/amdx86-64.h, src/m/ia64.h, src/m/ibms390x.h (pEd):
 +      New macro.
 +      * lisp.h (error, verror): Mark as printf-like functions.
 +      * eval.c (verror): Use vsnprintf, not doprnt, to do the real work.
 +      Report overflow in size calculations when allocating printf buffer.
 +      Do not truncate output string at its first null byte.
 +      * xdisp.c (vmessage): Use vsnprintf, not doprnt, to do the real work.
 +      Truncate the output at a character boundary, since vsnprintf does not
 +      do that.
 +      * charset.c (check_iso_charset_parameter): Convert internal
 +      character to string before calling 'error', since %c now has the
 +      printf meaning.
 +      * coding.c (Fdecode_sjis_char, Fdecode_big5_char): Avoid int
 +      overflow when computing char to be passed to 'error'.  Do not
 +      pass Lisp_Object to 'error'; pass the integer instead.
 +      * nsfns.m (Fns_do_applescript): Use int, not long, since it's
 +      formatted with plain %d.
 +
 +      * eval.c (internal_lisp_condition_case): Don't pass spurious arg.
 +
 +      * keyboard.c (access_keymap_keyremap): Print func name, not garbage.
 +
 +      * coding.c (Fdecode_sjis_char): Don't assume CODE fits in int.
 +
 +      * xterm.c (x_catch_errors): Remove duplicate declaration.
 +
 +      * term.c (maybe_fatal): Mark its 3rd arg as a printf format, too.
 +
 +      * xdisp.c, lisp.h (message_nolog): Remove; unused.
 +
+ 2011-04-09  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * image.c (Fimagemagick_types): Doc fix, and comment cleanup.
+ 
  2011-04-09  Chong Yidong  <cyd@stupidchicken.com>
  
        * ftfont.c (get_adstyle_property, ftfont_pattern_entity): Use