merge from upstream

diff --combined lisp/ChangeLog
index 333764d,ced3cf2..4902da0
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,3 -1,15 +1,15 @@@
+ 2010-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * files.el (locate-file-completion-table): Only list the .el and .elc
+       extensions if there's no other choice (bug#5955).
+ 
+       * facemenu.el (facemenu-self-insert-data): New var.
+       (facemenu-post-self-insert-function, facemenu-set-self-insert-face):
+       New functions.
+       (facemenu-add-face): Use them.
+ 
+       * simple.el (blink-matching-open): Obey forward-sexp-function.
+ 
  2010-08-18  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * simple.el (prog-mode-map): New var.
@@@ -26,17 -38,6 +38,17 @@@
        * emacs-lisp/autoload.el (make-autoload): Preload the macros's
        declarations that are useful before running the macro.
  
 +2010-08-18 Joakim Verona <joakim@verona.se>
 +        * image.el:
 +        (imagemagick-types-inhibit): New var.
 +        (imagemagick-register-types): New function.
 +      * image-mode.el:
 +      (image-transform-properties): New function.
 +      (image-transform-set-scale, image-transform-fit-to-height)
 +      (image-transform-set-rotation, image-transform-set-resize)
 +      (image-transform-fit-to-width, image-transform-fit-to-height):New functions.
 +      (image-toggle-display-image): Support image transforms.
 +
  2010-08-18  Katsumi Yamaoka  <yamaoka@jpl.org>
  
        * image.el (create-animated-image): Don't add heuristic mask to image

diff --combined src/ChangeLog
index 5d26db9,85d4da7..5b44cc8
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,32 +1,32 @@@
+ 2010-08-20  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * emacs.c <emacs_version>: Add a comment regarding
+       msdos/mainmake.v2's dependency on the syntax of this declaration.
+ 
+ 2010-08-20  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * dispnew.c (buffer_posn_from_coords): Fix calculation of buffer
+       position for R2L lines by mirroring the pixel position wrt the
+       text are box.  Improve commentary.
+ 
+ 2010-08-20  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * image.c (imagemagick_clear_image): Remove debugging output.
+ 
+ 2010-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * cmds.c (Vself_insert_face, Vself_insert_face_command): Remove.
+       (Qpost_self_insert_hook, Vpost_self_insert_hook): New vars.
+       (internal_self_insert): Run Qpost_self_insert_hook rather than handle
+       self-insert-face.
+       (syms_of_cmds): Initialize the new vars.
+ 
+ 2010-08-19  Jason Rumney  <jasonr@gnu.org>
+ 
+       * w32menu.c (set_frame_menubar): Remove call to undefined function.
+ 
+       * w32fns.c (w32_wnd_proc): Don't check context before initializing.
+ 
  2010-08-19  Jan Djärv  <jan.h.d@swipnet.se>
  
        * nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary".
@@@ -33,17 -62,6 +62,17 @@@
        NXSecondaryPboard = SecondarySelection.
        (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
  
 +2010-08-18 Joakim Verona <joakim@verona.se>
 +
 +        * image.c: Add support for ImageMagick. When HAVE_IMAGEMAGICK is
 +        defined:
 +        (imagemagick_image_p): New function to test for ImageMagic img.
 +        (imagemagick_load): New function to load ImageMagick img.
 +        (imagemagick_load_image): New function, helper for imagemagick_load
 +        (imagemagick-types): New function.
 +        (Qimagemagick): New Lisp_object.
 +      (imagemagick-render-type): New var, decides which renderer to use
 +
  2010-08-17  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL