aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorKatsumi Yamaoka2010-08-18 07:45:14 +0000
committerKatsumi Yamaoka2010-08-18 07:45:14 +0000
commit1075cd6169a81e8865714b26f7691cb9e1bc28db (patch)
tree0abcd7c631687e036c11debc3006c672889bab81 /lisp
parent3b083a0f13406f1384b51f14d5c878cc11e19889 (diff)
downloademacs-1075cd6169a81e8865714b26f7691cb9e1bc28db.tar.gz
emacs-1075cd6169a81e8865714b26f7691cb9e1bc28db.zip
create-animated-image: Don't add heuristic mask to image (Bug#6839).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/image.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9712bd80dd..6a92ea844aa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-08-18 Katsumi Yamaoka <yamaoka@jpl.org>
2
3 * image.el (create-animated-image): Don't add heuristic mask to image
4 (Bug#6839).
5
12010-08-18 Jan Djärv <jan.h.d@swipnet.se> 62010-08-18 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * term/ns-win.el (ns-get-pasteboard, ns-set-pasteboard): Use 8 * term/ns-win.el (ns-get-pasteboard, ns-set-pasteboard): Use
diff --git a/lisp/image.el b/lisp/image.el
index 287cca81570..4a68b4999ea 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -616,7 +616,7 @@ Images should not be larger than specified by `max-image-size'."
616 (let* ((animate (memq type image-animated-types)) 616 (let* ((animate (memq type image-animated-types))
617 (image 617 (image
618 (append (list 'image :type type (if data-p :data :file) file-or-data) 618 (append (list 'image :type type (if data-p :data :file) file-or-data)
619 (if animate '(:index 0 :mask heuristic)) 619 (if animate '(:index 0))
620 props))) 620 props)))
621 (if animate 621 (if animate
622 (image-animate-start image)) 622 (image-animate-start image))