bug#63676: cancelling editable dired causes UI problems with dired

[Michael Heerdegen <michael_heerdegen@web.de>]

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

Eli Zaretskii <eliz@gnu.org> writes:

> I seem to be unable to reproduce this.  But your recipe lack some
> details, so I'm unsure.  Would you please describe exactly what to
> type after "C-c ESC" to demonstrate that some commands don't work, and
> what did you expect those command to do?

I think this should be appropriate:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-Fix-cancellation-of-Wdired.patch --]
[-- Type: text/x-diff, Size: 976 bytes --]

From 59a7929f5e7653be1baa72208e2b89ef452962ea Mon Sep 17 00:00:00 2001
From: Michael Heerdegen <michael_heerdegen@web.de>
Date: Sat, 27 May 2023 02:26:09 +0200
Subject: [PATCH] Fix "Fix cancellation of Wdired"

* lisp/wdired.el (wdired-abort-changes): Call
`dired-build-subdir-alist' instead of `dired-revert'.
---
 lisp/wdired.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lisp/wdired.el b/lisp/wdired.el
index 70e908b3a38..e6a7ca1841d 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -473,9 +473,8 @@ wdired-abort-changes
     (insert wdired--old-content)
     (goto-char wdired--old-point))
   (wdired-change-to-dired-mode)
-  ;; Make sure the display is in synch, and all the variables are set
-  ;; correctly.
-  (dired-revert)
+  ;; Update markers in `dired-subdir-alist'
+  (dired-build-subdir-alist)
   (set-buffer-modified-p nil)
   (setq buffer-undo-list nil)
   (message "Changes aborted"))
--
2.30.2


[-- Attachment #3: Type: text/plain, Size: 662 bytes --]


Background: Aborting wdired (`wdired-abort-changes') erases the
buffer and insert the original buffer contents, then re-enters
dired-mode.  Positions in `dired-subdir-alist' (that are necessary for
$) are represented as markers.  These just have to be updated.


A less invasive way of aborting wdired could just undo any user changes.
I think this should be doable using change groups.  Then we would not
loose any kind of marker positions.  `wdired-finish-edit' does not
suffer from these kind of problems because it only touches buffer parts
that correspond to changed file lines.  Currently aborting is more
invasive than actually making changes.

Michael.