emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 0e9502b10e0: Correctly update image properties


From: Eli Zaretskii
Subject: master 0e9502b10e0: Correctly update image properties
Date: Sat, 12 Oct 2024 07:37:05 -0400 (EDT)

branch: master
commit 0e9502b10e08d1c93fe9b134b8cf74eae42c1eae
Author: Manuel Giraud <manuel@ledu-giraud.fr>
Commit: Eli Zaretskii <eliz@gnu.org>

    Correctly update image properties
    
    * lisp/image-mode.el (image--update-properties): New function to
    update image properties.
    (image-toggle-display-image): Use it.  (Bug#73617)
---
 lisp/image-mode.el | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 7cf7845e935..e75f6ea918f 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -867,6 +867,13 @@ The limits are given by the user option
         (or (<= mw (* (car size) scale))
             (<= mh (* (cdr size) scale))))))
 
+(defun image--update-properties (image properties)
+  "Update IMAGE with the new PROPERTIES set."
+  (let (prop)
+    (while (setq prop (pop properties))
+      (plist-put (cdr image) prop (pop properties)))
+    image))
+
 (defun image-toggle-display-image ()
   "Show the image of the image file.
 Turn the image data into a real image, but only if the whole file
@@ -959,7 +966,7 @@ was inserted."
 
     ;; Discard any stale image data before looking it up again.
     (image-flush image)
-    (setq image (append image (image-transform-properties image)))
+    (setq image (image--update-properties image (image-transform-properties 
image)))
     (setq props
          `(display ,image
                    ;; intangible ,image



reply via email to

[Prev in Thread] Current Thread [Next in Thread]