diff options
| author | Manuel Giraud | 2024-10-03 16:20:19 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2024-10-12 14:36:29 +0300 |
| commit | 0e9502b10e08d1c93fe9b134b8cf74eae42c1eae (patch) | |
| tree | 9b86df093e6422239d9bcafca79ea3ae53bd2a62 | |
| parent | bb5b25181ea7a4393f019dc641a981bdb6687c62 (diff) | |
| download | emacs-0e9502b10e08d1c93fe9b134b8cf74eae42c1eae.tar.gz emacs-0e9502b10e08d1c93fe9b134b8cf74eae42c1eae.zip | |
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)
| -rw-r--r-- | lisp/image-mode.el | 9 |
1 files changed, 8 insertions, 1 deletions
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 | |||
| 867 | (or (<= mw (* (car size) scale)) | 867 | (or (<= mw (* (car size) scale)) |
| 868 | (<= mh (* (cdr size) scale)))))) | 868 | (<= mh (* (cdr size) scale)))))) |
| 869 | 869 | ||
| 870 | (defun image--update-properties (image properties) | ||
| 871 | "Update IMAGE with the new PROPERTIES set." | ||
| 872 | (let (prop) | ||
| 873 | (while (setq prop (pop properties)) | ||
| 874 | (plist-put (cdr image) prop (pop properties))) | ||
| 875 | image)) | ||
| 876 | |||
| 870 | (defun image-toggle-display-image () | 877 | (defun image-toggle-display-image () |
| 871 | "Show the image of the image file. | 878 | "Show the image of the image file. |
| 872 | Turn the image data into a real image, but only if the whole file | 879 | Turn the image data into a real image, but only if the whole file |
| @@ -959,7 +966,7 @@ was inserted." | |||
| 959 | 966 | ||
| 960 | ;; Discard any stale image data before looking it up again. | 967 | ;; Discard any stale image data before looking it up again. |
| 961 | (image-flush image) | 968 | (image-flush image) |
| 962 | (setq image (append image (image-transform-properties image))) | 969 | (setq image (image--update-properties image (image-transform-properties image))) |
| 963 | (setq props | 970 | (setq props |
| 964 | `(display ,image | 971 | `(display ,image |
| 965 | ;; intangible ,image | 972 | ;; intangible ,image |