Mercurial > emacs
changeset 109891:373abedd1f02
merge from upstream
| author | joakim@verona.se |
|---|---|
| date | Fri, 20 Aug 2010 22:00:00 +0200 |
| parents | fd080c6fcd86 (diff) c15a51661b50 (current diff) |
| children | b7e155afcb64 |
| files | lisp/ChangeLog src/ChangeLog |
| diffstat | 6 files changed, 28 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Aug 20 22:49:20 2010 +0300 +++ b/.hgtags Fri Aug 20 22:00:00 2010 +0200 @@ -32,7 +32,6 @@ 1290d63e6ab3ab9e82f2fd0a35c436d05b2e0861 ttn-vms-21-2-B4 136de3bfa14feaa22a4f959b4273a6ba46a21f76 libc-960211 14a47b65c288d095f4b98a840ff8671eb8f893fe tmp_pcl_tag_131034C -14f1ff916f19fdbaa1ca42dc9dde418bba829d3e EMACS_PRETEST_23_1_95 1550283d0e53c078b71a91aadadd33ab575ac4ae EMACS_22_1 15c6663e567613de3e6f1a495c12a30402c2c32e zsh-merge-ognus-1 18f3cb26243f96e95636c2c9857f16bdb153dda7 before-miles-orphaned-changes @@ -563,7 +562,6 @@ 72276b334084264b708d0e34ad447735c4ce5e22 libc20x-970319 72276b334084264b708d0e34ad447735c4ce5e22 libc20x-970404 72276b334084264b708d0e34ad447735c4ce5e22 root-libc-2_0_x-branch -72f8f4f82b9d27158cd49fd93249f503a2d29228 EMACS_PRETEST_23_1_94 7361b2115a770c0597610e2c87c0a27de4fa66e0 libc-961121 73b00b4dd2a6a44d3e03aaf764c0c761f35a32e6 EMACS_PRETEST_21_0_93 75519a692473ba53cd5c01b411717dd3043e11cd libc_1_09 @@ -887,7 +885,6 @@ b9483b592728f369b212714efb929c5f9a2fcbb2 libc-960321 bfc0a609e15a1240a53e580cca2d37ca049e7399 libc-951206 bfc852aa5b34546929e12d73d920518010fd12bc EMACS_PRETEST_22_1_91 -bfc8980754ed5b8ba76061deadab49dc41e7d7dd EMACS_23_2 c17fd465ea95fc615961c63088385865705ca8a3 libc-970911 c17fd465ea95fc615961c63088385865705ca8a3 libc-970912 c17fd465ea95fc615961c63088385865705ca8a3 libc-970913 @@ -1006,7 +1003,6 @@ c17fd465ea95fc615961c63088385865705ca8a3 libc-980127 c17fd465ea95fc615961c63088385865705ca8a3 libc-980128 c296bfdefcc3e065cdbfe4820fad8bc45e8c824d EMACS_PRETEST_21_0_105 -c3a1d1b47790cdd266fa8dd5b560f94a981266de EMACS_PRETEST_23_1_96 c47ea87f3bd75650205a60bd22a77ac5c594ce15 libc-970715 c4bf2875d07244697fba32d82fda761b6d3c296d libc-970506 c4bf2875d07244697fba32d82fda761b6d3c296d libc-970507 @@ -1023,7 +1019,6 @@ d0e3ea40717c5b4a2d6c98104885828d69d1793f EMACS_23_1_BASE d1641e2dfc5bf66c0747230159fec66f382d8c47 Boehm-GC-base d2548396ceddd157578a78683d41a83f25b7c0f3 EMACS_PRETEST_23_0_92 -d4caa51ddfe29f3c5db72f3cf9ced08bf53b12cd EMACS_PRETEST_23_1_97 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970325 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970326 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970327
--- a/ChangeLog Fri Aug 20 22:49:20 2010 +0300 +++ b/ChangeLog Fri Aug 20 22:00:00 2010 +0200 @@ -1,3 +1,7 @@ +2010-08-18 Joakim Verona <joakim@verona.se> + + * config.in, Makefile.in, configure.in: Checks for ImageMagick. + 2010-08-10 Dan Nicolaescu <dann@ics.uci.edu> * configure.in (AC_PREREQ): Require autoconf 2.65. @@ -139,21 +143,6 @@ * Makefile.in (install-arch-indep): Delete any old info .gz files first. -2010-06-12 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 - * image.el: - (imagemagick-types-inhibit): New var. - (imagemagick-register-types): New function. - * config.in, Makefile.in, configure.in - 2010-06-11 Glenn Morris <rgm@gnu.org> * configure.in (--without-compress-info): New option.
--- a/configure Fri Aug 20 22:49:20 2010 +0300 +++ b/configure Fri Aug 20 22:00:00 2010 +0200 @@ -8726,7 +8726,7 @@ fi -$as_echo "#define HAVE_MAGICKEXPORTIMAGEPIXELS 1" >>confdefs.h +$as_echo "#define HAVE_MAGICKEXPORTIMAGEPIXELS 0" >>confdefs.h
--- a/configure.in Fri Aug 20 22:49:20 2010 +0300 +++ b/configure.in Fri Aug 20 22:00:00 2010 +0200 @@ -1852,7 +1852,7 @@ LIBS="$IMAGEMAGICK_LIBS $LIBS" fi - AC_DEFINE(HAVE_MAGICKEXPORTIMAGEPIXELS, 1, [Define to 1 if MagickExportImagePixels is defined.]) + AC_DEFINE(HAVE_MAGICKEXPORTIMAGEPIXELS, 0, [Define to 1 if MagickExportImagePixels is defined.]) AC_CHECK_FUNCS_ONCE(MagickExportImagePixels) fi
--- a/lisp/ChangeLog Fri Aug 20 22:49:20 2010 +0300 +++ b/lisp/ChangeLog Fri Aug 20 22:00:00 2010 +0200 @@ -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
--- a/src/ChangeLog Fri Aug 20 22:49:20 2010 +0300 +++ b/src/ChangeLog Fri Aug 20 22:00:00 2010 +0200 @@ -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