Fix problem of point movement in image-mode

* lisp/image-mode.el (image-mode): Switch disable-point-adjustment
on, otherwise `C-c C-c' will move point around oddly.
(image-toggle-display): Ensure that point is on the image (bug#46552).

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index ec0a559c8dba5e9bbd6eef68d0dee28f10c9cb5c..28b75c8113a8c41134e6dcdb23cf9ff51a93f7e6 100644 (file)
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -611,6 +611,7 @@ Key bindings:
   (major-mode-suspend)
   (setq major-mode 'image-mode)
   (setq image-transform-resize image-auto-resize)
+  (setq-local disable-point-adjustment t)
 
   ;; Bail out early if we have no image data.
   (if (zerop (buffer-size))
@@ -931,6 +932,7 @@ If the current buffer is displaying an image file as an image,
 call `image-mode-as-text' to switch to text or hex display.
 Otherwise, display the image by calling `image-mode'."
   (interactive)
+  (goto-char (point-min))
   (if (image-get-display-property)
       (image-mode-as-text)
     (if (eq major-mode 'hexl-mode)