summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/image-mode.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3482d4316c..5f04d5a2f11 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-13 Juanma Barranquero <lekktu@gmail.com>
+
+ * image-mode.el (image-transform-set-scale):
+ Fix change in 2011-04-09T20:28:01Z!cyd@stupidchicken.com.
+
2011-04-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/network-stream.el (network-stream-open-starttls): Only do
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 96d874dbec6..c99689f33ad 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -610,7 +610,7 @@ takes effect only if Emacs is compiled with ImageMagick support."
This command has no effect unless Emacs is compiled with
ImageMagick support."
(interactive "nScale: ")
- (setq image-transform-resize resize)
+ (setq image-transform-resize scale)
(image-toggle-display-image))
(defun image-transform-fit-to-height ()