bug#33631: 26.1.90; Image mode should keep scale on auto-revert

[Carlos Pita <carlosjosepita@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]

Here is a patch. image-transform-properties was not working on the
window of the current buffer, so I added a call to get-window-buffer.
In image-toggle-display-image (called from the auto-revert hook) this
was already being done, but the call to current-buffer was redundant
since it's the default, so I removed it. There are many other calls to
window-inside-pixel-edges around there but they don't seem to be
evaluated during auto-revert.

Regards
--
Carlos

[-- Attachment #2: 0001-Fix-auto-revert-resizing-33631.patch --]
[-- Type: text/x-patch, Size: 1886 bytes --]

From e4067b71b60c2507ce337b61e1282c1dc8e6ebcc Mon Sep 17 00:00:00 2001
From: memeplex <carlosjosepita@gmail.com>
Date: Wed, 2 Jan 2019 21:25:27 -0300
Subject: [PATCH] Fix auto-revert resizing #33631

---
 lisp/image-mode.el | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index c0186f0..9bf2ef3 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -756,8 +756,7 @@ image-toggle-display-image
 	 ;; If we have a `fit-width' or a `fit-height', don't limit
 	 ;; the size of the image to the window size.
 	 (edges (and (null image-transform-resize)
-		     (window-inside-pixel-edges
-		      (get-buffer-window (current-buffer)))))
+		     (window-inside-pixel-edges (get-buffer-window))))
 	 (type (if (fboundp 'imagemagick-types)
 		   'imagemagick
 		 (image-type file-or-data nil data-p)))
@@ -1161,6 +1160,7 @@ image-transform-properties
     ;; Note: `image-size' looks up and thus caches the untransformed
     ;; image.  There's no easy way to prevent that.
     (let* ((size (image-size spec t))
+           (edges (window-inside-pixel-edges (get-buffer-window)))
 	   (resized
 	    (cond
 	     ((numberp image-transform-resize)
@@ -1170,13 +1170,11 @@ image-transform-properties
 	     ((eq image-transform-resize 'fit-width)
 	      (image-transform-fit-width
 	       (car size) (cdr size)
-	       (- (nth 2 (window-inside-pixel-edges))
-		  (nth 0 (window-inside-pixel-edges)))))
+	       (- (nth 2 edges) (nth 0 edges))))
 	     ((eq image-transform-resize 'fit-height)
 	      (let ((res (image-transform-fit-width
 			  (cdr size) (car size)
-			  (- (nth 3 (window-inside-pixel-edges))
-			     (nth 1 (window-inside-pixel-edges))))))
+			  (- (nth 3 edges) (nth 1 edges)))))
 		(cons (cdr res) (car res)))))))
       `(,@(when (car resized)
 	    (list :width (car resized)))
-- 
2.19.2