From: Peter Münster <pm@a16n.net>
Date: Tue, 12 Oct 2021 12:31:58 +0000 (+0200)
Subject: Fix point movement in image-dired
X-Git-Tag: emacs-28.0.90~303
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3eac7dc780433e2eab046e83315f1d90caf3cab9;p=emacs.git

Fix point movement in image-dired

* lisp/image-dired.el (image-dired-thumb-file-marked-p): Don't
move point in associated dired buffer.
(image-dired-delete-marked): Revert "Fix deletion of associated image"
because it was wrong and introduced another problem (bug#51152).
---

diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 3ca47300a99..4e6a410c114 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -2314,18 +2314,19 @@ non-nil."
         (dired-buf (image-dired-associated-dired-buffer)))
     (when (and dired-buf file-name)
       (with-current-buffer dired-buf
-        (when (dired-goto-file file-name)
-          (image-dired-dired-file-marked-p))))))
+        (save-excursion
+          (when (dired-goto-file file-name)
+            (image-dired-dired-file-marked-p)))))))
 
 (defun image-dired-delete-marked ()
   "Delete current or marked thumbnails and associated images."
   (interactive)
-  (with-current-buffer (image-dired-associated-dired-buffer)
-    (dired-do-delete))
   (image-dired--with-marked
    (image-dired-delete-char)
    (backward-char))
-  (image-dired--line-up-with-method))
+  (image-dired--line-up-with-method)
+  (with-current-buffer (image-dired-associated-dired-buffer)
+    (dired-do-delete)))
 
 (defun image-dired-thumb-update-marks ()
   "Update the marks in the thumbnail buffer."