aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-08-20 19:21:51 -0700
committerGlenn Morris2010-08-20 19:21:51 -0700
commit0c9b8993e006e37d5bf48dd09d96e821fcfdcd6f (patch)
tree14c5bb81d994f318b2807a3177e096258349ee4a
parentb5c76d0c4f52f347b1c79f94aaa8e91916814673 (diff)
downloademacs-0c9b8993e006e37d5bf48dd09d96e821fcfdcd6f.tar.gz
emacs-0c9b8993e006e37d5bf48dd09d96e821fcfdcd6f.zip
ChangeLog fixes.
-rw-r--r--ChangeLog4
-rw-r--r--lisp/ChangeLog14
-rw-r--r--src/ChangeLog20
3 files changed, 19 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a8408316ac..94b84ed1c28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
12010-08-18 Joakim Verona <joakim@verona.se> 12010-08-18 Joakim Verona <joakim@verona.se>
2 2
3 * config.in, Makefile.in, configure.in: Checks for ImageMagick. 3 * Makefile.in, configure.in: Checks for ImageMagick.
4 4
52010-08-10 Dan Nicolaescu <dann@ics.uci.edu> 52010-08-10 Dan Nicolaescu <dann@ics.uci.edu>
6 6
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4902da03f4d..bfe106253ff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -38,15 +38,15 @@
38 * emacs-lisp/autoload.el (make-autoload): Preload the macros's 38 * emacs-lisp/autoload.el (make-autoload): Preload the macros's
39 declarations that are useful before running the macro. 39 declarations that are useful before running the macro.
40 40
412010-08-18 Joakim Verona <joakim@verona.se> 412010-08-18 Joakim Verona <joakim@verona.se>
42 * image.el: 42
43 (imagemagick-types-inhibit): New var. 43 * image.el (imagemagick-types-inhibit): New variable.
44 (imagemagick-register-types): New function. 44 (imagemagick-register-types): New function.
45 * image-mode.el: 45 * image-mode.el (image-transform-properties): New function.
46 (image-transform-properties): New function.
47 (image-transform-set-scale, image-transform-fit-to-height) 46 (image-transform-set-scale, image-transform-fit-to-height)
48 (image-transform-set-rotation, image-transform-set-resize) 47 (image-transform-set-rotation, image-transform-set-resize)
49 (image-transform-fit-to-width, image-transform-fit-to-height):New functions. 48 (image-transform-fit-to-width, image-transform-fit-to-height):
49 New functions.
50 (image-toggle-display-image): Support image transforms. 50 (image-toggle-display-image): Support image transforms.
51 51
522010-08-18 Katsumi Yamaoka <yamaoka@jpl.org> 522010-08-18 Katsumi Yamaoka <yamaoka@jpl.org>
diff --git a/src/ChangeLog b/src/ChangeLog
index 23374ba2e47..9b9e43864ab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -81,16 +81,16 @@
81 NXSecondaryPboard = SecondarySelection. 81 NXSecondaryPboard = SecondarySelection.
82 (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677). 82 (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
83 83
842010-08-18 Joakim Verona <joakim@verona.se> 842010-08-18 Joakim Verona <joakim@verona.se>
85 85
86 * image.c: Add support for ImageMagick. When HAVE_IMAGEMAGICK is 86 * image.c: Add support for ImageMagick. When HAVE_IMAGEMAGICK is
87 defined: 87 defined:
88 (imagemagick_image_p): New function to test for ImageMagic img. 88 (imagemagick_image_p): New function to test for ImageMagic image.
89 (imagemagick_load): New function to load ImageMagick img. 89 (imagemagick_load): New function to load ImageMagick image.
90 (imagemagick_load_image): New function, helper for imagemagick_load 90 (imagemagick_load_image): New function, helper for imagemagick_load.
91 (imagemagick-types): New function. 91 (imagemagick-types): New function.
92 (Qimagemagick): New Lisp_object. 92 (Qimagemagick): New Lisp_object.
93 (imagemagick-render-type): New var, decides which renderer to use 93 (imagemagick-render-type): New variable, decides which renderer to use.
94 94
952010-08-17 Stefan Monnier <monnier@iro.umontreal.ca> 952010-08-17 Stefan Monnier <monnier@iro.umontreal.ca>
96 96