aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoakim Verona2010-08-20 21:55:21 +0200
committerJoakim Verona2010-08-20 21:55:21 +0200
commitccd806186417c006a97ac89162d2af3acb3d3047 (patch)
treee15fcf659f82f0f7518149c7def2e80e1a9e45b2 /src
parent96fa1768839e3a9aa5ab5f2b782cea376460df9d (diff)
downloademacs-ccd806186417c006a97ac89162d2af3acb3d3047.tar.gz
emacs-ccd806186417c006a97ac89162d2af3acb3d3047.zip
minor imagemagick tweaks, one configure bugfix, and some ChangeLogs
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0a1a268d962..5d26db96634 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -33,6 +33,17 @@
33 NXSecondaryPboard = SecondarySelection. 33 NXSecondaryPboard = SecondarySelection.
34 (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677). 34 (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
35 35
362010-08-18 Joakim Verona <joakim@verona.se>
37
38 * image.c: Add support for ImageMagick. When HAVE_IMAGEMAGICK is
39 defined:
40 (imagemagick_image_p): New function to test for ImageMagic img.
41 (imagemagick_load): New function to load ImageMagick img.
42 (imagemagick_load_image): New function, helper for imagemagick_load
43 (imagemagick-types): New function.
44 (Qimagemagick): New Lisp_object.
45 (imagemagick-render-type): New var, decides which renderer to use
46
362010-08-17 Stefan Monnier <monnier@iro.umontreal.ca> 472010-08-17 Stefan Monnier <monnier@iro.umontreal.ca>
37 48
38 * gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL 49 * gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL